ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,139 Commits 2 Branches 0 Tags 54 MiB
67c22b4388
Commit Graph

33139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
67c22b4388 am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 
* commit 'fc3fa5dc1045a8f25fc1982443e05873edf028df':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
 2011-06-06 18:18:34 -07:00
Xavier Ducrohet
1b6c1b73d1 am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit 'f6e479993e7c85265692829990ceb3879fbce424':
  Import the Layoutlib from hc-mr1.
 2011-06-06 18:11:33 -07:00
Dianne Hackborn
4e4c8c6482 am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 
* commit '1b405592550c719aa5dd93178705ae08b4e84a2f':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
 2011-06-06 17:33:59 -07:00
Dianne Hackborn
1975da38d2 Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 2011-06-06 17:30:50 -07:00
Xavier Ducrohet
52909f1bac am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit '2a6dc7f19d463c7c9f7aacd12eca5263afd25a90':
  Import the Layoutlib from hc-mr1.
 2011-06-06 16:20:16 -07:00
Xavier Ducrohet
83176b7577 Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 2011-06-06 16:17:44 -07:00
Mathias Agopian
8180456e9c am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit 'c1cbf4525b4d12b6cb7908072d36c8f6ca819f5b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-06 15:25:32 -07:00
Mathias Agopian
e667e0c73b am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit '24855c09173a6caaec7dcedd0c2d7ce15121d39b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-06 15:21:44 -07:00
Mathias Agopian
f3d939c5e5 merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
Fix a race that could cause GL commands to be executed from the wrong thread.
  RefBase subclasses can now decide how they want to be destroyed.
  Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
  Fix a race-condtion in SurfaceFlinger that could lead to a crash.

initial cherry-pick:
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

Change-Id: I2a335e03fff219e35c18a7b0089b3a11d636576f
 2011-06-06 15:14:25 -07:00
Nick Pelly
78c3bed118 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-06-06 11:52:21 -07:00
TK MUN
82ce6dbd85 am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 11:51:22 -07:00
Eric Fischer
f89c33c4d1 am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
  Import revised translations.  DO NOT MERGE
 2011-06-06 11:50:16 -07:00
Jaikumar Ganesh
63a89d789f am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '58ada2f3bbab749fb5a813fb8f82eee347080405':
  Require bonding and encryption for PBAP server
 2011-06-06 11:34:11 -07:00
Jean-Baptiste Queru
6b078036f6 am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-06-06 11:33:52 -07:00
Eric Fischer
8f2bc7998d am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
  Import revised translations.  DO NOT MERGE
 2011-06-06 10:54:41 -07:00
Eric Fischer
2768505342 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-06-06 10:38:42 -07:00
Marco Nelissen
0129f1a27f resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp 
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
 2011-06-06 09:55:15 -07:00
Wink Saville
58ac798e45 am 6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE 
* commit '6ff5ba00b07b32f3c82bce2c412e5e8f30c202bc':
  Add FileUtils.checksumCrc32
 2011-06-04 06:24:40 -07:00
Wink Saville
a3bd4c076b Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE 2011-06-04 06:15:21 -07:00
Dianne Hackborn
d7ee0a04ef am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit 'b4815f47e6d612da6e2d0650a2d8f103626e3ec7':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 17:57:33 -07:00
Dianne Hackborn
4d3177dfda am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit 'bd754205d0b59315582855329649dad925a04b82':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 17:54:28 -07:00
Dianne Hackborn
77a171c55c Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 2011-06-03 17:52:23 -07:00
Roman Nurik
9170daa541 am 07613835: am e7d60078: Add old blog posts as articles, batch 1 
* commit '076138357027189f1bb90caf8c2e1a09497d78ac':
  Add old blog posts as articles, batch 1
 2011-06-03 17:40:11 -07:00
Roman Nurik
62a5e3e4d4 am e7d60078: Add old blog posts as articles, batch 1 
* commit 'e7d6007872af7f27b62bfb46aadf2b7a07c0eac0':
  Add old blog posts as articles, batch 1
 2011-06-03 17:27:03 -07:00
Dianne Hackborn
2faa91fc11 am dddd6b15: am 185e3e24: Fix when managed cursors are required. 
* commit 'dddd6b15d5274a6138facec9f553336fac5f6de6':
  Fix when managed cursors are required.
 2011-06-03 16:27:36 -07:00
Dianne Hackborn
7b68400e7c am 185e3e24: Fix when managed cursors are required. 
* commit '185e3e243ee1da136bcace854026b8abaf0c4c86':
  Fix when managed cursors are required.
 2011-06-03 16:23:15 -07:00
Robert Greenwalt
6925d63771 am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE 
* commit '80a19e67d1cd3710dbbfa52767a994512d20f694':
  Promote Telephony's isDataPossible.
 2011-06-03 15:46:08 -07:00
Robert Greenwalt
c1fdb11b74 Merge "Promote Telephony's isDataPossible." into honeycomb-LTE 2011-06-03 15:42:48 -07:00
John Wang
bff2a70a92 am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE 
* commit '3b71239aca01fb029d9acd2c606b7be9b8f32d66':
  Add supplyPuk to do SIM puk unlock.
 2011-06-03 14:09:13 -07:00
John Wang
34fef438ce Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE 2011-06-03 14:01:59 -07:00
Kazuhiro Ondo
02d3ec8112 am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting" 
* commit '77c9411306b6b3d210d22214d596272c9728cf5e':
  Data recovery failure due to apn/dc state stuck in "disconnecting"
 2011-06-03 12:19:23 -07:00
Daniel Sandler
5dbf6527c4 am f5699b82: am b4b44bd3: DO NOT MERGE. Restore status bar on phones. 
* commit 'f5699b82adef34b0b6bd88554c6a017f8662985e':
  DO NOT MERGE. Restore status bar on phones.
 2011-06-03 11:26:17 -07:00
Daniel Sandler
aac874a461 am b4b44bd3: DO NOT MERGE. Restore status bar on phones. 
* commit 'b4b44bd32983e154f2ad61b99809ed6cedd46d47':
  DO NOT MERGE. Restore status bar on phones.
 2011-06-03 11:22:49 -07:00
Gilles Debunne
3208f76592 am 00afa11c: am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2 
* commit '00afa11c1565da7ad6721db08a4da7c2ec1eacc0':
  Tap timeout removed on paste. Relying on position only.
 2011-06-03 10:35:58 -07:00
Andy Stadler
7ac3f736f4 am c22d145a: am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 
* commit 'c22d145a9f26314e23ea678e96766755268e878b':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
 2011-06-03 10:33:13 -07:00
Gilles Debunne
9467440179 am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2 
* commit '0538e6217de35e418c9779fd48c8300e65cc4f1e':
  Tap timeout removed on paste. Relying on position only.
 2011-06-03 10:32:00 -07:00
Andy Stadler
d163899fa6 am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 
* commit '3148557c42aaa8abf4001dc6fd759e911ba55280':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
 2011-06-03 10:28:45 -07:00
Gilles Debunne
b8c3181422 Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2 2011-06-03 10:26:18 -07:00
Andy Stadler
4d68ae93e2 Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 2011-06-03 10:24:27 -07:00
Wink Saville
e73d276f8b am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE 
* commit '5b4e24400a4f1a6c67efd08ab2cda3389f78144e':
  Refactor ServiceStateTracker handling of radio technology.
 2011-06-03 10:21:07 -07:00
Wink Saville
ffc24f1b5b Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE 2011-06-03 10:16:11 -07:00
satok
d01595f61b am e10de072: am be96408b: (Do not merge) Backport a fix for InputMethodManager.java 
* commit 'e10de072d50cbe6984151cbbdba4dd2f2e8310b9':
  (Do not merge) Backport a fix for InputMethodManager.java
 2011-06-02 23:25:14 -07:00
satok
63dc0677ec am be96408b: (Do not merge) Backport a fix for InputMethodManager.java 
* commit 'be96408b801666bf196adb0eabff4839e51e63ed':
  (Do not merge) Backport a fix for InputMethodManager.java
 2011-06-02 23:22:35 -07:00
Dianne Hackborn
b84e4b11fa am 758b67b1: am b46ed763: Add new Fragment API for explicitly saving/restoring state. 
* commit '758b67b12386a6ea52d520aef455c3150c9bae03':
  Add new Fragment API for explicitly saving/restoring state.
 2011-06-02 19:33:22 -07:00
Dianne Hackborn
8453c5fa89 am b46ed763: Add new Fragment API for explicitly saving/restoring state. 
* commit 'b46ed7636be9341b6ce0b158b3d86f34a437e6da':
  Add new Fragment API for explicitly saving/restoring state.
 2011-06-02 19:30:34 -07:00
Wink Saville
22ff9d86f6 am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 
* commit '2e543dc188c3c2e8f8a785e403c95b7e22fa6262':
  CdmaLte: Use SPN from SIM card if SIM card is presend
 2011-06-02 18:24:28 -07:00
Wink Saville
30fa58f972 am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE 
* commit '1076f5ff27d35a5a807043bdea49aa40404d9c6b':
  Read CSIM records in LTE on CDMA mode
 2011-06-02 18:24:20 -07:00
Wink Saville
bc69a26f21 Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 2011-06-02 18:21:50 -07:00
Wink Saville
7f1e2d79ca Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE 2011-06-02 18:21:37 -07:00
Jeff Brown
825d9b7d1d am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit 'c8812761609e532cceb400b112ed9982149c2490':
  Add a preference panel for mouse speed.
 2011-06-02 17:34:03 -07:00