OSDN Git Service
Carl Shapiro [Tue, 20 Apr 2010 18:50:45 +0000 (11:50 -0700)]
am
15feb4de: am
19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo
Merge commit '
15feb4defc61c7bded6fdd3ea1c3781f25666275' into kraken
* commit '
15feb4defc61c7bded6fdd3ea1c3781f25666275':
Remove code to pass the nonexistant lockprofsample flag to Dalvik.
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:47:31 +0000 (11:47 -0700)]
am
19fa6d45: 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 '
19fa6d4586df8ff7897fcc73b2228b431502d58e' into kraken
* commit '
19fa6d4586df8ff7897fcc73b2228b431502d58e':
Don't inflate the zoom button controller until we
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:33:21 +0000 (11:33 -0700)]
am
9d14e3ea: 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: I56761240d
Merge commit '
9d14e3ea22f48173070789951ee6dc64b507e13f' into kraken
* commit '
9d14e3ea22f48173070789951ee6dc64b507e13f':
When updating existing entries in the media database, don't update
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:22:27 +0000 (10:22 -0700)]
am
11bae140: am
3891c4cc: Fix issue
2602879: camera shutter sound not playing.
Merge commit '
11bae14009d91c063780b2cafee2fc4fb660c08c' into kraken
* commit '
11bae14009d91c063780b2cafee2fc4fb660c08c':
Fix issue
2602879: camera shutter sound not playing.
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:27:40 +0000 (09:27 -0700)]
am
3cd1f9f9: am
3b591260: Fix issue
2604270 Device auto connects to Car Dock (Media profile) after undocking.
Merge commit '
3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd' into kraken
* commit '
3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd':
Fix issue
2604270 Device auto connects to Car Dock (Media profile) after undocking.
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:29:22 +0000 (19:29 -0700)]
am
26f61635: am
0a4ab1b9: Merge "fix [
2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
Merge commit '
26f6163557980062dbb203388b3d0794ee0d06f7' into kraken
* commit '
26f6163557980062dbb203388b3d0794ee0d06f7':
fix [
2599939] "cannot play video" after open/close a video player a dozen of times
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:15:12 +0000 (19:15 -0700)]
am
06798769: am
7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo
Merge commit '
0679876997a5523a7539b8fe2c74a39434b17820' into kraken
* commit '
0679876997a5523a7539b8fe2c74a39434b17820':
Quietly handle EGL_BAD_NATIVE_WINDOW errors
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:59:20 +0000 (18:59 -0700)]
am
e3172405: am
c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data.
Merge commit '
e31724050041b4be41b7c868d531a6c00fd94587' into kraken
* commit '
e31724050041b4be41b7c868d531a6c00fd94587':
Make vCard allow users to refrain image export. Useful when
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:19:30 +0000 (16:19 -0700)]
am
8831d4dc: am
8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo
Merge commit '
8831d4dc5545cde841a0ef318b0ec870acfa0e45' into kraken
* commit '
8831d4dc5545cde841a0ef318b0ec870acfa0e45':
Update the comment which supposed to be checked in
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:41:05 +0000 (15:41 -0700)]
am
7f30f8ab: am
93d35f77: Merge "Fix bug
2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Merge commit '
7f30f8abe3161ae912c3475aa89ad14388f576d7' into kraken
* commit '
7f30f8abe3161ae912c3475aa89ad14388f576d7':
Fix bug
2587373 - awaken scrollbars when a scrolling view becomes visible.
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:31:24 +0000 (13:31 -0700)]
am
2f8c9e68: am
f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit '
2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e' into kraken
* commit '
2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e':
Misc fixes for throttling.
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.
Grace Kloba [Mon, 19 Apr 2010 20:21:58 +0000 (13:21 -0700)]
am
e3ce4c89: am
2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Merge commit '
e3ce4c89cc54770f01294adc3c3f052c062098c7' into kraken
* commit '
e3ce4c89cc54770f01294adc3c3f052c062098c7':
Remove fixed size restriction on the SurfaceView
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:36:17 +0000 (12:36 -0700)]
am
f57f147b: am
5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo
Merge commit '
f57f147bfd5d6f7530a938d2e05fc7d68f7343c3' into kraken
* commit '
f57f147bfd5d6f7530a938d2e05fc7d68f7343c3':
add droiddoc flag to include since-tags for api level 8
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:23:58 +0000 (12:23 -0700)]
am
bb9739c5: am
11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Merge commit '
bb9739c5d74404b9155565f2a08509079b719a22' into kraken
* commit '
bb9739c5d74404b9155565f2a08509079b719a22':
Reduce lock contention, removing unnecessary synchronization.
Grace Kloba [Mon, 19 Apr 2010 19:23:54 +0000 (12:23 -0700)]
am
66fa5cc7: am
99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo
Merge commit '
66fa5cc73dd20e8656c478e95f07798d8e20b44a' into kraken
* commit '
66fa5cc73dd20e8656c478e95f07798d8e20b44a':
Force redraw in touch_up if there is a move.
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:56:19 +0000 (11:56 -0700)]
am
9a9b09f6: am
afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Merge commit '
9a9b09f6bd209f9f46370c63cb72ab3460216b3b' into kraken
* commit '
9a9b09f6bd209f9f46370c63cb72ab3460216b3b':
Ease contention on the mProcessStatsThread mutex in updateCpuStats.
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:59:47 +0000 (09:59 -0700)]
am
e77bba8f: am
18920136: Merge "Reset notification state on wifi enable" into froyo
Merge commit '
e77bba8f2b67508fc6d4aa7b0054829c2d49965a' into kraken
* commit '
e77bba8f2b67508fc6d4aa7b0054829c2d49965a':
Reset notification state on wifi enable
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:48:18 +0000 (09:48 -0700)]
am
6aa2acca: 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 w
Merge commit '
6aa2accae3f58e4139f890f51c699901ee3abb88' into kraken
* commit '
6aa2accae3f58e4139f890f51c699901ee3abb88':
Fix bug
2599698 Music paused by itself
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:26:50 +0000 (08:26 -0700)]
am
daa107c8: am
3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Merge commit '
daa107c81db31b7fbaaf4219b0552ff07d44a29e' into kraken
* commit '
daa107c81db31b7fbaaf4219b0552ff07d44a29e':
Fix inconsistency in how we handle light sensor when battery is low.
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:35:10 +0000 (12:35 -0700)]
am
c2093636: am
7171ea81: Make ThrottleService more tamper resistant.
Merge commit '
c2093636db6141426ca7fe88f07b30a284e36759' into kraken
* commit '
c2093636db6141426ca7fe88f07b30a284e36759':
Make ThrottleService more tamper resistant.
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:36:44 +0000 (09:36 -0700)]
am
2572b046: am
975d86df: Merge "Dont check on interface value on API" into froyo
Merge commit '
2572b046d64a2d0b43d74870e1e899364f2bc721' into kraken
* commit '
2572b046d64a2d0b43d74870e1e899364f2bc721':
Dont check on interface value on API
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:40:54 +0000 (16:40 -0700)]
am
17e36d23: am
3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo
Merge commit '
17e36d233dff7178e60d841a650d9bef5d0af93c' into kraken
* commit '
17e36d233dff7178e60d841a650d9bef5d0af93c':
Missed a case to resumeUpdatePicture.
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:21:58 +0000 (16:21 -0700)]
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:21:38 +0000 (15:21 -0700)]
am
a9ea147d: merge from open-source master
Merge commit '
a9ea147dc204cd3eed7ed99f8b7d6464c7f740bf' into kraken
* commit '
a9ea147dc204cd3eed7ed99f8b7d6464c7f740bf':
Unify am startservice commands.
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:57:26 +0000 (14:57 -0700)]
am
66bee813: am
1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo
Merge commit '
66bee81321f16a3268adc43f5f87fcfbf8c27290' into kraken
* commit '
66bee81321f16a3268adc43f5f87fcfbf8c27290':
accept close() on database objects even if the database is closed
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:31:39 +0000 (13:31 -0700)]
am
cb2906e4: am
d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo
Merge commit '
cb2906e4bbb96b0be83029572a78f97dc6763eca' into kraken
* commit '
cb2906e4bbb96b0be83029572a78f97dc6763eca':
Add command line flags to enable lock profiling.
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:50:54 +0000 (12:50 -0700)]
am
329a5214: merge from open-source master
Merge commit '
329a52141c52e15caf4f0dba1735857c4ef4d478' into kraken
* commit '
329a52141c52e15caf4f0dba1735857c4ef4d478':
Allow Am to start services
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:26:52 +0000 (12:26 -0700)]
am
e0a40686: am
f066611a: retool resize logic to use max dimension and max area.
Merge commit '
e0a4068640cff64abcd3a70395ad461919b15ea6' into kraken
* commit '
e0a4068640cff64abcd3a70395ad461919b15ea6':
retool resize logic to use max dimension and max area.
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:30:18 +0000 (07:30 -0700)]
am
f04be52a: 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 '
f04be52a382544ff8006e227c1578a219ba0f23e' into kraken
* commit '
f04be52a382544ff8006e227c1578a219ba0f23e':
For search suggestions in the search dialog, allow the 'title'
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
Mike Lockwood [Fri, 16 Apr 2010 03:26:33 +0000 (20:26 -0700)]
Merge "GpsLocationProvider: Eliminate MIN_FIX_COUNT." into kraken
Mike Lockwood [Fri, 16 Apr 2010 03:26:09 +0000 (20:26 -0700)]
Merge "GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed." into kraken
Jim Miller [Fri, 16 Apr 2010 00:55:18 +0000 (17:55 -0700)]
Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken
Jim Miller [Fri, 16 Apr 2010 00:47:01 +0000 (17:47 -0700)]
Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken
Robert Greenwalt [Fri, 16 Apr 2010 00:45:26 +0000 (17:45 -0700)]
am
32ebaf57: am
e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit '
32ebaf57d8646542b80e848441830a5ef834aed3' into kraken
* commit '
32ebaf57d8646542b80e848441830a5ef834aed3':
Add multi-sim support to ThrottleService.
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
Mathias Agopian [Thu, 15 Apr 2010 22:24:35 +0000 (15:24 -0700)]
Merge "when a zero dimension buffer is allocated, turn the allocation into a 1x1 buffer instead of Nx1 (or 1xN)" into kraken
Mathias Agopian [Thu, 15 Apr 2010 21:57:39 +0000 (14:57 -0700)]
when a zero dimension buffer is allocated, turn the allocation into
a 1x1 buffer instead of Nx1 (or 1xN)
Change-Id: I27eeb15e83e13002dd9405f4e52b54f7dffc0fe7
Dianne Hackborn [Thu, 15 Apr 2010 21:41:13 +0000 (14:41 -0700)]
Merge "Introduce new API version to avoid breakage with the Froyo APIs; introduce padding in the resources to avoid cross-branch merge pain." into kraken
Dianne Hackborn [Thu, 15 Apr 2010 20:39:16 +0000 (13:39 -0700)]
am
292bdbd9: am
e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit '
292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293' into kraken
* commit '
292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293':
A little more improvement of the Service javadoc.
Robert Greenwalt [Thu, 15 Apr 2010 20:37:31 +0000 (13:37 -0700)]
am
d65d5f11: am
bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit '
d65d5f114f74ed4d7d4defee5d56eeaa133fda72' into kraken
* commit '
d65d5f114f74ed4d7d4defee5d56eeaa133fda72':
Fix SntpClient to give accurate time info.
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:23:59 +0000 (12:23 -0700)]
am
7a4b22f6: am
4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA.
Merge commit '
7a4b22f6293c7dce2dd667b7ebd171af2eff91a9' into kraken
* commit '
7a4b22f6293c7dce2dd667b7ebd171af2eff91a9':
Remove native binaries when an updated system application is upgraded through OTA.
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:43:29 +0000 (06:43 -0700)]
am
2349dc5d: am
fa22de79: Merge "Import revised translations" into froyo
Merge commit '
2349dc5d7aac9c0bde9fc38f69114db0f38ed319' into kraken
* commit '
2349dc5d7aac9c0bde9fc38f69114db0f38ed319':
Import revised translations