OSDN Git Service
The Android Open Source Project [Thu, 22 Apr 2010 18:43:17 +0000 (11:43 -0700)]
merge from open-source master
Change-Id: I2a3a06f0bd3530f9c0d3cb64ca6a87913649d64b
Robert Greenwalt [Thu, 22 Apr 2010 16:11:35 +0000 (09:11 -0700)]
am
05fa2144: Merge "Trim throttle logs." into froyo
Merge commit '
05fa2144e458dc8f024235ea01b8682055d828bf' into froyo-plus-aosp
* commit '
05fa2144e458dc8f024235ea01b8682055d828bf':
Trim throttle logs.
Robert Greenwalt [Thu, 22 Apr 2010 16:08:25 +0000 (09:08 -0700)]
Merge "Trim throttle logs." into froyo
Grace Kloba [Thu, 22 Apr 2010 15:23:35 +0000 (08:23 -0700)]
am
2fba6d1c: Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
Merge commit '
2fba6d1c1b445b2d26ccd32eb4084e759f513c5d' into froyo-plus-aosp
* commit '
2fba6d1c1b445b2d26ccd32eb4084e759f513c5d':
Post a message to set SurfaceView to be visible when
Grace Kloba [Thu, 22 Apr 2010 15:20:23 +0000 (08:20 -0700)]
Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
Kenny Root [Thu, 22 Apr 2010 03:06:51 +0000 (20:06 -0700)]
Merge "Fix broken logic in SettingsProvider.parseProviderList."
Christopher Tate [Thu, 22 Apr 2010 01:15:44 +0000 (18:15 -0700)]
am
36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '
36fa47139d4621dc4bf8d89caa8650495d901b00' into froyo-plus-aosp
* commit '
36fa47139d4621dc4bf8d89caa8650495d901b00':
Fix security hole in Google backup transport registration
Christopher Tate [Thu, 22 Apr 2010 01:10:20 +0000 (18:10 -0700)]
Merge "Fix security hole in Google backup transport registration" into froyo
John Wang [Wed, 21 Apr 2010 21:46:06 +0000 (14:46 -0700)]
am
23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit '
23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp
* commit '
23c0b2eb5a610030ad5afe406987cb09c858ccfb':
Add ILLEGAL_SIM_OR_ME error code.
John Wang [Wed, 21 Apr 2010 21:43:12 +0000 (14:43 -0700)]
Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Joe Onorato [Wed, 21 Apr 2010 18:07:43 +0000 (11:07 -0700)]
am
52e70b25: Add title to recent apps dialog.
Merge commit '
52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a' into froyo-plus-aosp
* commit '
52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a':
Add title to recent apps dialog.
The Android Open Source Project [Wed, 21 Apr 2010 16:10:43 +0000 (09:10 -0700)]
merge from open-source master
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
Mathias Agopian [Wed, 21 Apr 2010 05:26:45 +0000 (22:26 -0700)]
am
83512d4d: DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16
Merge commit '
83512d4dfc06137bc2d9db0cb62644c54f41a771' into froyo-plus-aosp
* commit '
83512d4dfc06137bc2d9db0cb62644c54f41a771':
DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
Mathias Agopian [Wed, 21 Apr 2010 04:55:40 +0000 (21:55 -0700)]
DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
don't use glDrawTexi() anymore
Change-Id: If71334de39114b0edce7771366f8d8dc26f6911e
Jeff Brown [Wed, 21 Apr 2010 00:54:59 +0000 (17:54 -0700)]
am
22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit '
22caecda8a24c971972d78a112279c48f242d529' into froyo-plus-aosp
* commit '
22caecda8a24c971972d78a112279c48f242d529':
Fix PM crash due to bad array bookkeeping logic.
Jeff Brown [Wed, 21 Apr 2010 00:53:00 +0000 (17:53 -0700)]
Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Robert Greenwalt [Wed, 21 Apr 2010 00:39:38 +0000 (17:39 -0700)]
am
be348964: Merge "Move Tethering off the ServerThread." into froyo
Merge commit '
be34896457bb37b4e263efa87316d2e2420adab3' into froyo-plus-aosp
* commit '
be34896457bb37b4e263efa87316d2e2420adab3':
Move Tethering off the ServerThread.
Robert Greenwalt [Wed, 21 Apr 2010 00:37:22 +0000 (17:37 -0700)]
Merge "Move Tethering off the ServerThread." into froyo
Andreas Huber [Tue, 20 Apr 2010 23:32:30 +0000 (16:32 -0700)]
am
9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
Merge commit '
9e609b0dfa155fbe8ba3b5abd4faa188e2270dde' into froyo-plus-aosp
* commit '
9e609b0dfa155fbe8ba3b5abd4faa188e2270dde':
Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
Andreas Huber [Tue, 20 Apr 2010 23:29:23 +0000 (16:29 -0700)]
Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
Jean-Michel Trivi [Tue, 20 Apr 2010 23:00:58 +0000 (16:00 -0700)]
am
fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot re
Merge commit '
fe8620ac42c9b61ab47fab83caa34816e6404ee5' into froyo-plus-aosp
* commit '
fe8620ac42c9b61ab47fab83caa34816e6404ee5':
Update AudioService to reflect phone state changes with AudioFocus.
Jean-Michel Trivi [Tue, 20 Apr 2010 22:57:30 +0000 (15:57 -0700)]
Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot request audio focus (request is denied). Because the phone state is now mostly handled like a new client, there is no need monitor mode changes and to keep track of undispatched focus changes, as those will delayed focus gains will now automatically happen at the end of the call when the phone client is removed from the focus stack." into froyo
Suchi Amalapurapu [Tue, 20 Apr 2010 22:08:50 +0000 (15:08 -0700)]
am
0dde41fb: Merge "Fix
2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
Merge commit '
0dde41fbe0e36bfe059399c839604267ad0318c1' into froyo-plus-aosp
* commit '
0dde41fbe0e36bfe059399c839604267ad0318c1':
Fix
2610961
Suchi Amalapurapu [Tue, 20 Apr 2010 22:04:41 +0000 (15:04 -0700)]
Merge "Fix
2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
Andreas Huber [Tue, 20 Apr 2010 21:52:57 +0000 (14:52 -0700)]
am
25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo
Merge commit '
25dc5f30b2a8276c5790c7152a801fcd905c7281' into froyo-plus-aosp
* commit '
25dc5f30b2a8276c5790c7152a801fcd905c7281':
Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
Andreas Huber [Tue, 20 Apr 2010 21:48:45 +0000 (14:48 -0700)]
Merge "Don't coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo
Jean-Michel Trivi [Tue, 20 Apr 2010 21:45:06 +0000 (14:45 -0700)]
am
8ccbd4ba: Merge "Fix bug
2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo
Merge commit '
8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee' into froyo-plus-aosp
* commit '
8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee':
Fix bug
2604132 40s skip after undocking
Jean-Michel Trivi [Tue, 20 Apr 2010 21:41:11 +0000 (14:41 -0700)]
Merge "Fix bug
2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo
Michael Richardson [Tue, 3 Nov 2009 22:01:28 +0000 (17:01 -0500)]
Allow META* macros outside of the framework
The META* macros are useful outside of the framework
for other systems implementing Binder interfaces, but
they depend upon the android namespace. This includes
the appropriate namespace operations, which should be
sane even in that android namespace.
Change-Id: If600156c65191f51f487d0ee301d9f9f532b263d
Nicolas Roard [Tue, 20 Apr 2010 20:26:36 +0000 (13:26 -0700)]
am
b876bdb5: Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
Merge commit '
b876bdb52e7c72ced8e7764946e5beb914f17036' into froyo-plus-aosp
* commit '
b876bdb52e7c72ced8e7764946e5beb914f17036':
Speed up layers rendering when using animations
Nicolas Roard [Tue, 20 Apr 2010 20:22:44 +0000 (13:22 -0700)]
Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
Daniel Sandler [Tue, 20 Apr 2010 20:01:58 +0000 (13:01 -0700)]
am
c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Merge commit '
c96307efd2829cdd0fa7c835484f2f89edf7d883' into froyo-plus-aosp
* commit '
c96307efd2829cdd0fa7c835484f2f89edf7d883':
Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
Daniel Sandler [Tue, 20 Apr 2010 19:57:54 +0000 (12:57 -0700)]
Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Jean-Michel Trivi [Tue, 20 Apr 2010 19:12:13 +0000 (12:12 -0700)]
Fix bug
2604132 40s skip after undocking
In case of A2DP write errors, there is an overflow in the calculation
of the sleep duration to simulate the timing of a successful write.
Change-Id: Ic4e570aebf07fac69735aab1bbc2fc73512ee795
Carl Shapiro [Tue, 20 Apr 2010 18:48:09 +0000 (11:48 -0700)]
am
19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo
Merge commit '
19275cb5b028c18228674f87ba4cbc98d8520c5e' into froyo-plus-aosp
* commit '
19275cb5b028c18228674f87ba4cbc98d8520c5e':
Remove code to pass the nonexistant lockprofsample flag to Dalvik.
Grace Kloba [Tue, 20 Apr 2010 18:43:18 +0000 (11:43 -0700)]
am
738a0460: Merge "Don\'t inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo
Merge commit '
738a0460c5c6b45506f5203b87d62f2ac99a8e7a' into froyo-plus-aosp
* commit '
738a0460c5c6b45506f5203b87d62f2ac99a8e7a':
Don't inflate the zoom button controller until we
Carl Shapiro [Tue, 20 Apr 2010 18:42:39 +0000 (11:42 -0700)]
Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo
Grace Kloba [Tue, 20 Apr 2010 18:40:07 +0000 (11:40 -0700)]
Merge "Don't inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo
Marco Nelissen [Tue, 20 Apr 2010 18:28:59 +0000 (11:28 -0700)]
am
9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug
2594125 Change-Id: I56761240d6f6e699514169d
Merge commit '
9b8b417cd1ddfb81c1b0314f033a1439fd627aa2' into froyo-plus-aosp
* commit '
9b8b417cd1ddfb81c1b0314f033a1439fd627aa2':
When updating existing entries in the media database, don't update
Marco Nelissen [Tue, 20 Apr 2010 18:24:10 +0000 (11:24 -0700)]
Merge "When updating existing entries in the media database, don't update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug
2594125 Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2" into froyo
Eric Laurent [Tue, 20 Apr 2010 17:18:07 +0000 (10:18 -0700)]
am
3891c4cc: Fix issue
2602879: camera shutter sound not playing.
Merge commit '
3891c4cc918e8062abb97c542a8625d556dccc59' into froyo-plus-aosp
* commit '
3891c4cc918e8062abb97c542a8625d556dccc59':
Fix issue
2602879: camera shutter sound not playing.
Eric Laurent [Tue, 20 Apr 2010 16:22:32 +0000 (09:22 -0700)]
am
3b591260: Fix issue
2604270 Device auto connects to Car Dock (Media profile) after undocking.
Merge commit '
3b5912602bec6ccbe8eef8a576730b1565f0067c' into froyo-plus-aosp
* commit '
3b5912602bec6ccbe8eef8a576730b1565f0067c':
Fix issue
2604270 Device auto connects to Car Dock (Media profile) after undocking.
Mathias Agopian [Tue, 20 Apr 2010 02:26:31 +0000 (19:26 -0700)]
am
0a4ab1b9: Merge "fix [
2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
Merge commit '
0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa' into froyo-plus-aosp
* commit '
0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa':
fix [
2599939] "cannot play video" after open/close a video player a dozen of times
Mathias Agopian [Tue, 20 Apr 2010 02:23:45 +0000 (19:23 -0700)]
Merge "fix [
2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
Jack Palevich [Tue, 20 Apr 2010 02:10:13 +0000 (19:10 -0700)]
am
7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo
Merge commit '
7305f4166306dac08fc63056f2c85e91015df879' into froyo-plus-aosp
* commit '
7305f4166306dac08fc63056f2c85e91015df879':
Quietly handle EGL_BAD_NATIVE_WINDOW errors
Mathias Agopian [Tue, 20 Apr 2010 02:09:03 +0000 (19:09 -0700)]
fix [
2599939] "cannot play video" after open/close a video player a dozen of times
get rid off the MAP_ONCE flag is MemoryHeapBase (as well as it's functionality),
this feature should not be used anymore.
the software renderer was incorrectly using the default ctor which set MAP_ONCE,
causing the leak. the software renderer itself is incorrectly used while coming
back from sleep.
Change-Id: I123621f8d140550b864f352bbcd8a5729db12b57
Jack Palevich [Tue, 20 Apr 2010 02:06:35 +0000 (19:06 -0700)]
Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo
Daisuke Miyakawa [Tue, 20 Apr 2010 01:52:07 +0000 (18:52 -0700)]
am
c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data.
Merge commit '
c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8' into froyo-plus-aosp
* commit '
c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8':
Make vCard allow users to refrain image export. Useful when
Grace Kloba [Mon, 19 Apr 2010 23:15:41 +0000 (16:15 -0700)]
am
8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo
Merge commit '
8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp
* commit '
8f655cb6c836380778545fb13044d97ef57139d6':
Update the comment which supposed to be checked in
Grace Kloba [Mon, 19 Apr 2010 23:11:21 +0000 (16:11 -0700)]
Merge "Update the comment which supposed to be checked in in the last CL." into froyo
Adam Powell [Mon, 19 Apr 2010 22:38:11 +0000 (15:38 -0700)]
am
93d35f77: Merge "Fix bug
2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Merge commit '
93d35f77439f54cc55ff63b6e274dec0ac6c3c47' into froyo-plus-aosp
* commit '
93d35f77439f54cc55ff63b6e274dec0ac6c3c47':
Fix bug
2587373 - awaken scrollbars when a scrolling view becomes visible.
Adam Powell [Mon, 19 Apr 2010 22:33:08 +0000 (15:33 -0700)]
Merge "Fix bug
2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Robert Greenwalt [Mon, 19 Apr 2010 20:25:46 +0000 (13:25 -0700)]
am
f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit '
f06f2eb2d646789d723d4a08d0681cae5b40b768' into froyo-plus-aosp
* commit '
f06f2eb2d646789d723d4a08d0681cae5b40b768':
Misc fixes for throttling.
Robert Greenwalt [Mon, 19 Apr 2010 20:21:01 +0000 (13:21 -0700)]
Merge "Misc fixes for throttling." into froyo
Grace Kloba [Mon, 19 Apr 2010 20:17:53 +0000 (13:17 -0700)]
am
2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Merge commit '
2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp
* commit '
2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
Remove fixed size restriction on the SurfaceView
Grace Kloba [Mon, 19 Apr 2010 20:14:21 +0000 (13:14 -0700)]
Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Scott Main [Mon, 19 Apr 2010 19:33:18 +0000 (12:33 -0700)]
am
5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo
Merge commit '
5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53' into froyo-plus-aosp
* commit '
5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53':
add droiddoc flag to include since-tags for api level 8
Scott Main [Mon, 19 Apr 2010 19:28:15 +0000 (12:28 -0700)]
Merge "add droiddoc flag to include since-tags for api level 8" into froyo
Brad Fitzpatrick [Mon, 19 Apr 2010 19:22:07 +0000 (12:22 -0700)]
am
11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Merge commit '
11bea2e216800c5612144f76d307da653d565be3' into froyo-plus-aosp
* commit '
11bea2e216800c5612144f76d307da653d565be3':
Reduce lock contention, removing unnecessary synchronization.
Grace Kloba [Mon, 19 Apr 2010 19:18:22 +0000 (12:18 -0700)]
am
99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo
Merge commit '
99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp
* commit '
99c5179fafcccff2bcc05b4c7fb04007bb438f67':
Force redraw in touch_up if there is a move.
Brad Fitzpatrick [Mon, 19 Apr 2010 19:17:48 +0000 (12:17 -0700)]
Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Grace Kloba [Mon, 19 Apr 2010 19:14:41 +0000 (12:14 -0700)]
Merge "Force redraw in touch_up if there is a move." into froyo
Brad Fitzpatrick [Mon, 19 Apr 2010 18:54:05 +0000 (11:54 -0700)]
am
afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Merge commit '
afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5' into froyo-plus-aosp
* commit '
afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5':
Ease contention on the mProcessStatsThread mutex in updateCpuStats.
Brad Fitzpatrick [Mon, 19 Apr 2010 18:50:53 +0000 (11:50 -0700)]
Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Irfan Sheriff [Mon, 19 Apr 2010 16:55:44 +0000 (09:55 -0700)]
am
18920136: Merge "Reset notification state on wifi enable" into froyo
Merge commit '
1892013643537f5fc330f5b0a02a0e9cb08b1134' into froyo-plus-aosp
* commit '
1892013643537f5fc330f5b0a02a0e9cb08b1134':
Reset notification state on wifi enable
Irfan Sheriff [Mon, 19 Apr 2010 16:50:37 +0000 (09:50 -0700)]
Merge "Reset notification state on wifi enable" into froyo
Jean-Michel Trivi [Mon, 19 Apr 2010 16:45:41 +0000 (09:45 -0700)]
am
04152f98: Merge "Fix bug
2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it\'s using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started bef
Merge commit '
04152f98ffbd17f54a6b771636ff7f440f0edc78' into froyo-plus-aosp
* commit '
04152f98ffbd17f54a6b771636ff7f440f0edc78':
Fix bug
2599698 Music paused by itself
Jean-Michel Trivi [Mon, 19 Apr 2010 16:41:19 +0000 (09:41 -0700)]
Merge "Fix bug
2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it's using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started before the listener was set. The theory about the bug is that the player finished playing before the listener was called. Therefore the audio focus was never abandonned, and the music didn't resume." into froyo
Mike Lockwood [Mon, 19 Apr 2010 15:22:39 +0000 (08:22 -0700)]
am
3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Merge commit '
3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a' into froyo-plus-aosp
* commit '
3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a':
Fix inconsistency in how we handle light sensor when battery is low.
Mike Lockwood [Mon, 19 Apr 2010 15:18:58 +0000 (08:18 -0700)]
Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Robert Greenwalt [Sun, 18 Apr 2010 19:27:03 +0000 (12:27 -0700)]
am
7171ea81: Make ThrottleService more tamper resistant.
Merge commit '
7171ea8179e09270e4d6ab825a2320816eee39c5' into froyo-plus-aosp
* commit '
7171ea8179e09270e4d6ab825a2320816eee39c5':
Make ThrottleService more tamper resistant.
Irfan Sheriff [Sat, 17 Apr 2010 16:31:19 +0000 (09:31 -0700)]
am
975d86df: Merge "Dont check on interface value on API" into froyo
Merge commit '
975d86dfc6407314491a18bc715c8c95a8f8f0b1' into froyo-plus-aosp
* commit '
975d86dfc6407314491a18bc715c8c95a8f8f0b1':
Dont check on interface value on API
Irfan Sheriff [Sat, 17 Apr 2010 16:27:25 +0000 (09:27 -0700)]
Merge "Dont check on interface value on API" into froyo
Grace Kloba [Fri, 16 Apr 2010 23:38:25 +0000 (16:38 -0700)]
am
3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo
Merge commit '
3c44db3f67c1f0bf82191ba77ca479c0e7fede34' into froyo-plus-aosp
* commit '
3c44db3f67c1f0bf82191ba77ca479c0e7fede34':
Missed a case to resumeUpdatePicture.
Grace Kloba [Fri, 16 Apr 2010 23:34:43 +0000 (16:34 -0700)]
Merge "Missed a case to resumeUpdatePicture." into froyo
Scott Main [Fri, 16 Apr 2010 23:17:55 +0000 (16:17 -0700)]
Scott Main [Fri, 16 Apr 2010 23:14:33 +0000 (16:14 -0700)]
Merge "cherry-pick from master:
c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug
2595831)" into froyo
The Android Open Source Project [Fri, 16 Apr 2010 22:18:28 +0000 (15:18 -0700)]
merge from open-source master
Change-Id: I050a2b6f3d09f079a50491aeabb86b242a59d647
Vasu Nori [Fri, 16 Apr 2010 21:53:32 +0000 (14:53 -0700)]
am
1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo
Merge commit '
1fc46c623f9af8aaccfd519ece78331d9a95e579' into froyo-plus-aosp
* commit '
1fc46c623f9af8aaccfd519ece78331d9a95e579':
accept close() on database objects even if the database is closed
Vasu Nori [Fri, 16 Apr 2010 21:48:47 +0000 (14:48 -0700)]
Merge "accept close() on database objects even if the database is closed" into froyo
Carl Shapiro [Fri, 16 Apr 2010 20:28:23 +0000 (13:28 -0700)]
am
d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo
Merge commit '
d5a873fbe8df67e86990969b6729db0079bbc278' into froyo-plus-aosp
* commit '
d5a873fbe8df67e86990969b6729db0079bbc278':
Add command line flags to enable lock profiling.
Carl Shapiro [Fri, 16 Apr 2010 20:25:03 +0000 (13:25 -0700)]
Merge "Add command line flags to enable lock profiling." into froyo
The Android Open Source Project [Fri, 16 Apr 2010 19:46:21 +0000 (12:46 -0700)]
merge from open-source master
Change-Id: I93512089253f00b3da1e31f8b5f4d6e72fae8dc4
Mike Reed [Fri, 16 Apr 2010 19:24:09 +0000 (12:24 -0700)]
am
f066611a: retool resize logic to use max dimension and max area.
Merge commit '
f066611aab5758b7b2a6b4a525e3f85aa813064a' into froyo-plus-aosp
* commit '
f066611aab5758b7b2a6b4a525e3f85aa813064a':
retool resize logic to use max dimension and max area.
Mike LeBeau [Fri, 16 Apr 2010 14:27:34 +0000 (07:27 -0700)]
am
0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo
Merge commit '
0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp
* commit '
0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
For search suggestions in the search dialog, allow the 'title'
Mike LeBeau [Fri, 16 Apr 2010 14:23:12 +0000 (07:23 -0700)]
Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo
Robert Greenwalt [Fri, 16 Apr 2010 00:42:24 +0000 (17:42 -0700)]
am
e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit '
e80c6f49d5055e299b7ada91b5967feab66e467b' into froyo-plus-aosp
* commit '
e80c6f49d5055e299b7ada91b5967feab66e467b':
Add multi-sim support to ThrottleService.
Robert Greenwalt [Fri, 16 Apr 2010 00:37:55 +0000 (17:37 -0700)]
Merge "Add multi-sim support to ThrottleService." into froyo
Dianne Hackborn [Thu, 15 Apr 2010 20:36:44 +0000 (13:36 -0700)]
am
e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit '
e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp
* commit '
e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
A little more improvement of the Service javadoc.
Dianne Hackborn [Thu, 15 Apr 2010 20:33:21 +0000 (13:33 -0700)]
Merge "A little more improvement of the Service javadoc." into froyo
Robert Greenwalt [Thu, 15 Apr 2010 20:33:03 +0000 (13:33 -0700)]
am
bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit '
bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp
* commit '
bf943f296864d9647268fb5a55805ebf1fcba173':
Fix SntpClient to give accurate time info.
Robert Greenwalt [Thu, 15 Apr 2010 20:28:43 +0000 (13:28 -0700)]
Merge "Fix SntpClient to give accurate time info." into froyo
David 'Digit' Turner [Thu, 15 Apr 2010 19:19:23 +0000 (12:19 -0700)]
am
4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA.
Merge commit '
4f99e3c28449833b10ee23c538246847fdb6a498' into froyo-plus-aosp
* commit '
4f99e3c28449833b10ee23c538246847fdb6a498':
Remove native binaries when an updated system application is upgraded through OTA.
Kenny Root [Thu, 15 Apr 2010 13:00:18 +0000 (06:00 -0700)]
am
fa22de79: Merge "Import revised translations" into froyo
Merge commit '
fa22de7993f94d338330a888bdc2aeaaf857c719' into froyo-plus-aosp
* commit '
fa22de7993f94d338330a888bdc2aeaaf857c719':
Import revised translations
Kenny Root [Thu, 15 Apr 2010 12:55:00 +0000 (05:55 -0700)]
Merge "Import revised translations" into froyo
Mike Lockwood [Thu, 15 Apr 2010 12:48:26 +0000 (05:48 -0700)]
am
93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
Merge commit '
93597ed1839de164c81f83832d4c2373ea32ac8f' into froyo-plus-aosp
* commit '
93597ed1839de164c81f83832d4c2373ea32ac8f':
Fix wakelock leak in PowerManagerService.sendNotificationLocked()
Mike Lockwood [Thu, 15 Apr 2010 12:45:21 +0000 (05:45 -0700)]
Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
Dianne Hackborn [Thu, 15 Apr 2010 05:27:10 +0000 (22:27 -0700)]
Robert Greenwalt [Thu, 15 Apr 2010 03:25:51 +0000 (20:25 -0700)]
am
8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
Merge commit '
8090edae9ed1228e8cbaa14dd94c6ce885a0b729' into froyo-plus-aosp
* commit '
8090edae9ed1228e8cbaa14dd94c6ce885a0b729':
Sholes mobile iface comes/goes - handle the reset
Suchi Amalapurapu [Thu, 15 Apr 2010 03:25:48 +0000 (20:25 -0700)]
am
deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well.
Merge commit '
deb69370ef9a786940ae49411ba657410361b4f1' into froyo-plus-aosp
* commit '
deb69370ef9a786940ae49411ba657410361b4f1':
Revert "Add ordered broadcast when removing packages."