ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
40,809 Commits 2 Branches 0 Tags 54 MiB
011daf74e3
Commit Graph

40809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
e9d5835aa0 Merge "resolved conflicts for merge of ea54b760 to master" 2011-11-09 09:10:42 -08:00
The Android Open Source Project
ef3da468af am eae6c997: Reconcile with ics-mr0-release 
* commit 'eae6c9972d91b9af58c3bf7ba0235c0a3e95c408':
 2011-11-09 17:03:59 +00:00
Robert Greenwalt
129f890205 resolved conflicts for merge of ea54b760 to master 
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
 2011-11-09 09:03:59 -08:00
The Android Open Source Project
bea63fd645 Reconcile with ics-mr0-release 
Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63
 2011-11-09 09:00:40 -08:00
Jean-Michel Trivi
72aa4697fa am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1 
* commit '20cf0916cc6a4920b1d882a9478615a15fe6b3b0':
  Bug 5585323 New system permission for media decode
 2011-11-09 16:59:48 +00:00
Jean-Michel Trivi
bd33207d68 Merge "Bug 5585323 New system permission for media decode" into ics-mr1 2011-11-09 08:57:43 -08:00
Steve Block
fe07f201ba Merge "Add another test for WebView's Java Bridge" 2011-11-09 08:49:37 -08:00
David Brown
0455970132 am b6b44cef: am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0 
* commit 'b6b44cef94a38b6f403b43f55d77d3602de18a3c':
  Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
 2011-11-09 16:44:53 +00:00
Glenn Kasten
d1d81e5874 am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit 'f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
 2011-11-09 16:44:51 +00:00
Jake Hamby
d39f857624 am 9c5c97f6: am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 
* commit '9c5c97f61818f4d20079616a98d62f888f07d285':
 2011-11-09 16:44:49 +00:00
David Brown
394d2b68d0 am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0 
* commit '59882fb8e0ba7c47b780d62c9a9c46b63d779677':
  Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
 2011-11-09 16:41:20 +00:00
Glenn Kasten
70f3211abb am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit '19998120f53caceb620f138c6eea182f1e693660':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 16:41:19 +00:00
Jake Hamby
f1896025db am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 
* commit 'fee5f29b22f99bd2891fb2af54669f20832fb851':
  Fix exception when sending multi-page SMS with Turkish characters.
 2011-11-09 16:40:59 +00:00
Eric Laurent
d27ea3e1fe am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1 
* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
  Fix regression for SoundPool playback
 2011-11-09 16:29:04 +00:00
Eric Laurent
b2e9b55ecb Merge "Fix regression for SoundPool playback" into ics-mr1 2011-11-09 08:27:20 -08:00
Brian Colonna
56f9109fc6 am 09a56563: am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 
* commit '09a56563cea260f12b5606837f5b01420b920170':
 2011-11-09 15:38:45 +00:00
Brian Colonna
170e4c4ea7 am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 
* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
  Fix 5514230: preventing null window token from occurring
 2011-11-09 15:35:12 +00:00
Gilles Debunne
336aee8e81 am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1 
* commit '76bb11ca642556673249a6ef8b84ab2813deaa87':
  Bug 5575396: close spell session on language change
 2011-11-09 14:36:59 +00:00
Jeff Sharkey
a6ef0fce17 am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1 
* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
  Bootstrap stats before registering listeners.
 2011-11-09 14:36:57 +00:00
Jeff Sharkey
b3f4c21ccf am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
  Make operation counts monotonically increase.
 2011-11-09 14:36:56 +00:00
Jeff Sharkey
0411244c39 am 2048789c: Merge "Dispatch alerts through background thread." into ics-mr1 
* commit '2048789c64d30b0d3c42c4df7e705f14b7295e10':
  Dispatch alerts through background thread.
 2011-11-09 14:36:54 +00:00
Jeff Sharkey
c4dc631c2b am f3882914: Merge "Make policy data enabled flag static." into ics-mr1 
* commit 'f3882914e668501ee1dabd42207ed18348050c14':
  Make policy data enabled flag static.
 2011-11-09 14:36:53 +00:00
Daniel Sandler
239a0b5255 am da738d63: Merge "Add day of week." into ics-mr1 
* commit 'da738d638cc2fee29d5936f21c6eadbcf173a718':
  Add day of week.
 2011-11-09 14:36:52 +00:00
Mathias Agopian
5f367ae123 am e4a1bafb: Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1 
* commit 'e4a1bafba351a1b4cea18af3442412de03dd4d89':
  decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.
 2011-11-09 14:36:46 +00:00
Dianne Hackborn
1bf50366ea am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1 
* commit 'cd489c4ce59c134c384238cbb613ede34f28189c':
  Don't crash if there is no connectivity service.
 2011-11-09 14:36:44 +00:00
Svetoslav Ganov
86f370da76 am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 
* commit '1bef480b223f03d0fc866f08ca101a07ead89bc2':
  NumberPicker incorectly enforcing minimal width and height.
 2011-11-09 14:36:39 +00:00
Jeff Sharkey
48e5483f44 am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1 
* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a':
  Avoid inconsistent state when remove fails.
 2011-11-09 14:36:36 +00:00
Jeff Brown
18fc2a2723 am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 
* commit 'bc0b010ecc7254b0e2c7a0268e5242557579b471':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
 2011-11-09 14:36:34 +00:00
Mathias Agopian
a364841e31 am 393e2c1f: Merge "SensorService now always clamps the requested rate" into ics-mr1 
* commit '393e2c1f7aad37e7851643df22e4810996c26d1f':
  SensorService now always clamps the requested rate
 2011-11-09 14:36:31 +00:00
Dianne Hackborn
a0e7618c25 am 3af8b88d: Merge "Add drop box reports of low memory." into ics-mr1 
* commit '3af8b88d032011fdbc6c498cf3f3881281cff999':
  Add drop box reports of low memory.
 2011-11-09 14:36:29 +00:00
Michael Kolb
3afe164fcd am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1 
* commit 'a4293ba1a0f1129d5879ae9eda45292ff357e20c':
  Remove flicker from WebTextView
 2011-11-09 14:36:22 +00:00
Jamie Gennis
f4fe83f96d am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1 
* commit 'd211b4882a662409b85a1f90c71e28faa9c54464':
  SurfaceTexture: unhide setDefaultBufferSize
 2011-11-09 14:36:15 +00:00
Jamie Gennis
d834b2f85d am 911263dc: Merge changes I18e5e789,I5cbaae2d into ics-mr1 
* commit '911263dc5df48b89e8f9010fb74dfe2649bdc442':
  EGL: implement loading and saving the cache
  EGL: use an in-memory the blob cache
 2011-11-09 14:36:14 +00:00
Mathias Agopian
312f6c76eb am 95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1 
* commit '95482b61c348fc54bf44a96a8b73011c90b40520':
  Fix an issue where we could wait for a non-existing transaction
 2011-11-09 14:36:11 +00:00
Irfan Sheriff
72f7fbeac3 am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1 
* commit '59c73b92a9ef8df5d4873bc36f05b776c3a476bc':
  Convert soft ap config store to state machine
 2011-11-09 14:36:09 +00:00
JP Abgrall
09e1068230 Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp 2011-11-09 14:36:09 +00:00
Dave Santoro
616bbbd10b am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1 
* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
  Unhide social stream APIs for Contacts.
 2011-11-09 14:36:00 +00:00
Adam Powell
ce78e11ad8 am 650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1 
* commit '650a3e8894c6d26b258d26bdec856fde7aba43d6':
  Fix the action bar menu layout to use the correct divider drawable.
 2011-11-09 14:35:59 +00:00
Wei Huang
ce417ad019 am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 
* commit 'ea50748b546e7dc21dc06195af5f0a8f2b812417':
  Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
 2011-11-09 14:35:56 +00:00
Matthew Xie
cd99c18818 am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 14:35:53 +00:00
Dianne Hackborn
f96004644b am 665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1 
* commit '665e105f145fcb27a54d53c6c9382bebf50a56d7':
  Cleanup remote execution of perf tests.
 2011-11-09 14:35:51 +00:00
The Android Open Source Project
5ae931bb74 am 6dee1a9d: Reconcile with ics-mr0-release 
* commit '6dee1a9d046458134fb019669b5ffe7911dcdb29':
 2011-11-09 14:35:48 +00:00
Adam Cohen
8f002f0ab6 am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
  Making default widget padding public API
 2011-11-09 14:35:45 +00:00
Glenn Kasten
086e2da211 am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit '19998120f53caceb620f138c6eea182f1e693660':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 14:35:18 +00:00
Tom Taylor
52920840e2 am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
  Add new secure setting for controlling Messaging notifications
 2011-11-09 14:34:18 +00:00
The Android Automerger
d8be24e84b merge in ics-mr0-release history after reset to ics-mr0 2011-11-09 06:28:43 -08:00
Kristian Monsen
422532eb3f Merge "Part of fix for bug 5584571 Add HTTP request header with app name" 2011-11-09 03:35:01 -08:00
David 'Digit' Turner
87b39f8b50 Merge "NDK: ANativeActivity: Fix documentation for 'clazz' member." 2011-11-09 02:18:02 -08:00
Flavio Lerda
9626c08dac Merge "Adding two tests to ensure formatNumber is working correctly with Polish numbers, both valid and invalid." 2011-11-09 02:13:41 -08:00
Gilles Debunne
005c75cc49 Merge "Bug 5575396: close spell session on language change" into ics-mr1 2011-11-09 00:26:46 -08:00