ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
42,157 Commits 2 Branches 0 Tags 54 MiB
9c31b9e723
Commit Graph

42157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
9c31b9e723 am abe0ed49: am 641a5624: Reconcile with ics-mr0-release 
* commit 'abe0ed4916537bf7244a4723e374591bfcf7e967':
 2011-12-09 14:58:07 -08:00
The Android Open Source Project
001e423026 am 54854d31: Reconcile with ics-mr0-release ics-mr1-release 
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
  More fixing for issue #5366535: Lockscreen has wrong layout...
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
 2011-12-09 14:57:48 -08:00
Nick Pelly
3a51491c7e Merge "Add BluetoothAdapter.getRemoteDevice(byte[])" 2011-12-09 14:37:05 -08:00
Nick Pelly
bcf60e2fb3 Merge "Fix BasicNfcEeTest java package." 2011-12-09 14:36:23 -08:00
Gilles Debunne
73f964f15e am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1 
* commit 'aee940df55b5d1f769f56ff8a6dd645253b7f8e5':
  IOOB is Suggestions
 2011-12-09 14:25:55 -08:00
Gilles Debunne
2d288fd5a5 am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1 
* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
  Prevent NPE in SuggestionSpan
 2011-12-09 14:25:53 -08:00
Jeff Tinker
bdb7342098 am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 
* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-09 14:25:49 -08:00
Jeff Brown
f1154c79c1 am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1 
* commit '03e634270d880407316b51fac2278e604fc82703':
  Shortcut keys should be handled on down, not up.
 2011-12-09 14:25:41 -08:00
Jeff Brown
10fc3b07a0 am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1 
* commit '944c985b4199e6e029568ea87004c9727e469cc0':
  Fix system hotkey handling.
 2011-12-09 14:25:38 -08:00
Jack Palevich
5cf2844870 Merge "Fix convert8To4, convert8To5" 2011-12-09 14:19:39 -08:00
Jack Palevich
2b93f0bf44 Fix convert8To4, convert8To5 
See b/5680952 "Compilation warnings in etc1.cpp" for discussion.

Fixes b/5680952

Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
 2011-12-09 14:06:07 -08:00
Irfan Sheriff
992f67b2c5 Merge "Change RSSI notification levels to 5 in framework" 2011-12-09 12:43:28 -08:00
Romain Guy
f647099b58 Merge "Enable dirty regions on newly created EGL surfaces" 2011-12-09 12:28:46 -08:00
Kristian Monsen
9479f3bb08 Merge "Update string lengths, fix for bug 5732776" 2011-12-09 10:12:41 -08:00
Alex Sakhartchouk
a662e2ee63 Merge "Making UI a bit more responsive." 2011-12-09 10:04:27 -08:00
Narayan Kamath
8ed4c98940 Merge "Remove BlockingMediaPlayer." 2011-12-09 06:30:14 -08:00
Romain Guy
b634cd3f13 Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917" 2011-12-08 18:51:03 -08:00
Romain Guy
870165d2a2 GenerationCache::get would return a random value instead of NULL 
Bug #5401917

This was causing a ton of random crashes in apps.

Change-Id: I9069a060824ec89115cd3bcd38beaeb9ecc4488e
 2011-12-08 18:50:27 -08:00
Fabrice Di Meglio
e2c4709019 Merge "Clean TextLayout code and remove RTL_USE_HARFBUZZ" 2011-12-08 15:42:28 -08:00
The Android Open Source Project
65e2784b8a am 641a5624: Reconcile with ics-mr0-release 
* commit '641a5624075ee942b85b17646b57f65377567a06':
 2011-12-08 10:29:04 -08:00
The Android Open Source Project
1b487a6be1 Reconcile with ics-mr0-release 
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
 2011-12-08 10:26:33 -08:00
The Android Open Source Project
ddbd1fd2bd Reconcile with ics-mr0-release ics-mr1-release 
Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c
 2011-12-08 10:21:43 -08:00
Gilles Debunne
20cbf307bd am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1 
* commit 'a5a98a034b4d52c6bbc75e72f74f1a6ea1c61ed5':
  IOOB is Suggestions
 2011-12-08 10:01:29 -08:00
Gilles Debunne
ff1defc308 am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1 
* commit '89f2e8a099c32cdbb8409482fe91dabea5a7673e':
  Prevent NPE in SuggestionSpan
 2011-12-08 10:01:27 -08:00
Gilles Debunne
91e3720a47 Merge "IOOB is Suggestions" into ics-mr1 2011-12-08 09:59:44 -08:00
Gilles Debunne
5a63853ae8 Merge "Prevent NPE in SuggestionSpan" into ics-mr1 2011-12-08 09:59:29 -08:00
Kenny Root
24ffaf64e7 Merge "Add aapt support for implicitly-granted permissions" 2011-12-08 09:02:51 -08:00
The Android Automerger
b6033fa64c merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 07:00:35 -08:00
Jeff Tinker
ecb836d33b am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 
* commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-08 00:16:22 -08:00
Jeff Tinker
624c9bf09e Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 2011-12-08 00:13:43 -08:00
Jeff Brown
e36321e70b am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1 
* commit '8e0ecbfc97606ea30d0d8216fea635888f766b9d':
  Shortcut keys should be handled on down, not up.
 2011-12-07 23:31:03 -08:00
Jeff Brown
3e39ba7d94 am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1 
* commit 'e0e9fd981ca71aeaa45c888485c11788456bd838':
  Fix system hotkey handling.
 2011-12-07 23:31:02 -08:00
Jeff Brown
6cdd6659a9 Merge "Shortcut keys should be handled on down, not up." into ics-mr1 2011-12-07 23:29:52 -08:00
Jeff Brown
515dd4d129 Merge "Fix system hotkey handling." into ics-mr1 2011-12-07 23:29:45 -08:00
James Dong
8d6d101975 Merge "Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed to the callback could be 0." 2011-12-07 23:05:03 -08:00
Dave Burke
0cf6a43b68 am e118c1de: am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1 
* commit 'e118c1de0037e6732b66b9f52903567caa961c31':
  Remove dangerous and useless optimization Bug #5525888
 2011-12-07 20:43:18 -08:00
Dave Burke
77a27ab257 am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1 
* commit 'ef8913c035e679ea8b8891e26db1fa571e9b9d54':
  Remove dangerous and useless optimization Bug #5525888
 2011-12-07 20:41:27 -08:00
Dave Burke
73b2d11e0d Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1 2011-12-07 20:40:10 -08:00
Wink Saville
6c17c6f3a0 am ea75b822: am 234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1 
* commit 'ea75b82221dc9086cf97a791aed3b79ff3731bba':
  When the SIM_READY set current preferred network type.
 2011-12-07 20:19:50 -08:00
Wink Saville
381cabe802 am 234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1 
* commit '234a5ef66275087aff9cfb94adc7608e9f358f11':
  When the SIM_READY set current preferred network type.
 2011-12-07 20:18:06 -08:00
Wink Saville
7f69cab4a8 Merge "When the SIM_READY set current preferred network type." into ics-mr1 2011-12-07 20:15:45 -08:00
Jaikumar Ganesh
0d27049377 am 38342c9d: am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1 
* commit '38342c9d858d8b021bc5c616cfe6c0ab9f359b2b':
  Reduce likelihood of crash in state machine.
 2011-12-07 19:53:47 -08:00
Jaikumar Ganesh
f30ded7bac am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1 
* commit 'd426c338a66f63f8e5528ac38ec5b61625f2c897':
  Reduce likelihood of crash in state machine.
 2011-12-07 19:52:11 -08:00
Jaikumar Ganesh
169fabc9bc Merge "Reduce likelihood of crash in state machine." into ics-mr1 2011-12-07 19:50:03 -08:00
John Wang
039ff50dc6 am 2de0b07f: am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1 
* commit '2de0b07f47c3561b6e550ff630901d2776a437e3':
  Correct the dialing number of structured MMI.
 2011-12-07 19:03:42 -08:00
Gilles Debunne
8730c74c90 am 0235016a: am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1 
* commit '0235016acb241556f24689e3d818db6973b5ad4f':
  Insert into user dict with the correct locale
 2011-12-07 19:03:30 -08:00
John Wang
49847e0667 am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1 
* commit 'ca0a68cc8afd023c94bcd5a1f3f2b2f9407fbe3b':
  Correct the dialing number of structured MMI.
 2011-12-07 18:51:11 -08:00
John Wang
8fdf67ce4b Merge "Correct the dialing number of structured MMI." into ics-mr1 2011-12-07 18:49:28 -08:00
Gilles Debunne
28e571c486 am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1 
* commit '2df13452e05745a3da624c34018da983173c32c4':
  Insert into user dict with the correct locale
 2011-12-07 18:42:04 -08:00
Gilles Debunne
19b1a8ae0c Merge "Insert into user dict with the correct locale" into ics-mr1 2011-12-07 18:41:04 -08:00