drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,634 Commits 1 Branch 0 Tags
Commit Graph

61634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
0669a77fe9 Merge "resolved conflicts for merge of ea54b760 to master" 2011-11-09 09:10:42 -08:00
Steve Block
4cd73c5bfd Clean up JavaDoc for WebView.addJavascriptInterface() 
Bug: 5461416
Change-Id: Ic83e0e4035f6230134e4f36938e53f106c468876
 2011-11-09 17:04:49 +00:00
The Android Open Source Project
ef725e83ac am eae6c997: Reconcile with ics-mr0-release 
* commit 'eae6c9972d91b9af58c3bf7ba0235c0a3e95c408':
 2011-11-09 17:03:59 +00:00
Robert Greenwalt
c1b3cbe164 resolved conflicts for merge of ea54b760 to master 
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
 2011-11-09 09:03:59 -08:00
The Android Open Source Project
eae6c9972d Reconcile with ics-mr0-release 
Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63
 2011-11-09 09:00:40 -08:00
Jean-Michel Trivi
036da41922 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
20cf0916cc Merge "Bug 5585323 New system permission for media decode" into ics-mr1 2011-11-09 08:57:43 -08:00
Steve Block
2f91443269 Merge "Add another test for WebView's Java Bridge" 2011-11-09 08:49:37 -08:00
David Brown
6e82e95c08 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
874641f133 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
0fc2847bd5 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
b6b44cef94 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
f2c2b1c484 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
9c5c97f618 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
db7d79e6f1 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
2b7f91b932 Merge "Fix regression for SoundPool playback" into ics-mr1 2011-11-09 08:27:20 -08:00
Steve Block
8e33fe944f Add another test for WebView's Java Bridge 
Tests that an exception is raised if the wrong number of arguments are passed
to a method of an injected object.

Bug: 5140673
Change-Id: Ic9f9d09969e0fccbe82584e1a9ca7580f6010c87
 2011-11-09 16:22:13 +00:00
Brian Colonna
c8c5bc443f 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
09a56563ce 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
7e7b4e7c82 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
33e3710aaf 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
489b431273 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
028fe5a715 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
cef1300ebd 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
f01a9c0476 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
a508f056d0 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
0141b7275e 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
cc03abe1fc 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
79c4ad17f9 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
0816b0c871 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
6437035400 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
3b2681bad9 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
3a77503ca1 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
7e6c75f5a5 am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1 
* commit 'd211b4882a662409b85a1f90c71e28faa9c54464':
  SurfaceTexture: unhide setDefaultBufferSize
 2011-11-09 14:36:15 +00:00
Jamie Gennis
3cb007e44d 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
0170810ce4 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
1c9126c64b 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
b4a96805d6 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
8e2c51137c 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
b7dc4a3316 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
e64022ca65 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
3a6f9ded54 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
0350701422 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
5a903cd0b6 am 6dee1a9d: Reconcile with ics-mr0-release 
* commit '6dee1a9d046458134fb019669b5ffe7911dcdb29':
 2011-11-09 14:35:48 +00:00
Adam Cohen
068b7f02a3 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
bb1b7d5cb3 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
81b10fd74e 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
7040a65cbc merge in ics-mr0-release history after reset to ics-mr0 2011-11-09 06:28:43 -08:00
Kristian Monsen
b69ce80383 Merge "Part of fix for bug 5584571 Add HTTP request header with app name" 2011-11-09 03:35:01 -08:00
Kristian Monsen
008c37d8f4 Part of fix for bug 5584571 Add HTTP request header with app name 
Need the context to get the package name, adding it method here
that can be called from JNI.

Change-Id: I530d81d9d922ea73a3f9d185618a5c4cfde0aca7
 2011-11-09 11:23:35 +00:00