Suchi Amalapurapu
91be3d2eff
am 0c64ff75: am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
2010-04-20 15:22:15 -07:00
Suchi Amalapurapu
c4f41a76b6
am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
...
Merge commit 'd32f942280cc4390ab853321557eef06292b300e' into kraken
* commit 'd32f942280cc4390ab853321557eef06292b300e':
Fix 2610961
2010-04-20 15:14:41 -07:00
Suchi Amalapurapu
c0c5f705e1
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
2010-04-20 15:08:50 -07:00
Andreas Huber
0fca57fe9d
am c9553f2e: am 1e1edb2c: 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 fro
2010-04-20 15:05:50 -07:00
Suchi Amalapurapu
b39bdc37ba
Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
2010-04-20 15:04:41 -07:00
Andreas Huber
68e3b83cf8
am 1e1edb2c: 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 '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0' into kraken
* commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0':
Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
2010-04-20 14:57:25 -07:00
Jean-Michel Trivi
e10105f0cd
am bb331f73: am 0fabf2e8: 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
2010-04-20 14:56:51 -07:00
Andreas Huber
3338371999
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.
2010-04-20 14:52:57 -07:00
Andreas Huber
7b783a8be7
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
2010-04-20 14:48:45 -07:00
Jean-Michel Trivi
5bd957f458
am 0fabf2e8: 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 '0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8' into kraken
* commit '0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8':
Fix bug 2604132 40s skip after undocking
2010-04-20 14:48:15 -07:00
Jean-Michel Trivi
394da77279
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
2010-04-20 14:45:06 -07:00
Jean-Michel Trivi
ab1f727968
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
2010-04-20 14:41:11 -07:00
Nicolas Roard
dd894134f2
am 796c5fc6: am 3f5d7b83: am b876bdb5: Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
2010-04-20 13:36:07 -07:00
Nicolas Roard
8ba40ffed2
am 3f5d7b83: am b876bdb5: Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
...
Merge commit '3f5d7b83ee194db39c5f784146e4abc4f6568854' into kraken
* commit '3f5d7b83ee194db39c5f784146e4abc4f6568854':
Speed up layers rendering when using animations
2010-04-20 13:29:11 -07:00
Nicolas Roard
2f36f7f8d7
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
2010-04-20 13:26:36 -07:00
Nicolas Roard
0ff7210220
Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
2010-04-20 13:22:44 -07:00
Daniel Sandler
e61da1bc89
am 5272399a: (-s ours) am 29019cb9: (-s ours) am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
2010-04-20 13:13:03 -07:00
Daniel Sandler
a42b781f04
am 29019cb9: (-s ours) am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
...
Merge commit '29019cb9773dfc7645c9326725a6ac514020eef7' into kraken
* commit '29019cb9773dfc7645c9326725a6ac514020eef7':
Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
2010-04-20 13:06:57 -07:00
Daniel Sandler
cf19b1ace0
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)
2010-04-20 13:01:58 -07:00
Daniel Sandler
3438793a56
Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
2010-04-20 12:57:54 -07:00
Jean-Michel Trivi
e783275aca
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
2010-04-20 12:12:13 -07:00
Carl Shapiro
818217354e
am dbc108a7: am 15feb4de: am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo
2010-04-20 11:56:47 -07:00
Grace Kloba
42123dd1bf
am 20fa839d: 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
2010-04-20 11:53:01 -07:00
Carl Shapiro
87445514bb
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.
2010-04-20 11:50:45 -07:00
Carl Shapiro
86e5a3b016
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.
2010-04-20 11:48:09 -07:00
Grace Kloba
91c474ab4e
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
2010-04-20 11:47:31 -07:00
Grace Kloba
471ae8e8cc
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
2010-04-20 11:43:18 -07:00
Carl Shapiro
4dd73c65e4
Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo
2010-04-20 11:42:39 -07:00
Marco Nelissen
d4f46df253
am fe13eebe: 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-I
2010-04-20 11:42:02 -07:00
Grace Kloba
f1f24f304b
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
2010-04-20 11:40:07 -07:00
Marco Nelissen
1de1a5fffb
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
2010-04-20 11:33:21 -07:00
Marco Nelissen
aeabc2a827
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
2010-04-20 11:28:59 -07:00
Marco Nelissen
dbd5ad43e8
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
2010-04-20 11:24:10 -07:00
Eric Laurent
48699781b2
am 5b550c9e: am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter sound not playing.
2010-04-20 10:31:43 -07:00
Eric Laurent
e601bdb8d1
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.
2010-04-20 10:22:27 -07:00
Kenny Root
b9e7cfc2f7
Merge "Refactor Styled utility functions into reusable objects."
2010-04-20 10:20:59 -07:00
Eric Laurent
dfa927920c
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.
2010-04-20 10:18:07 -07:00
Ben Murdoch
346d49540d
Merge "Add 3 touch tests to the ignored result list."
2010-04-20 10:10:24 -07:00
Eric Laurent
56150dd14a
am e33e9db6: am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.
2010-04-20 10:02:16 -07:00
Eric Laurent
6dc7e7c7d2
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.
2010-04-20 09:27:40 -07:00
Eric Laurent
d92e6cc4cd
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.
2010-04-20 09:22:32 -07:00
Daisuke Miyakawa
e72494568d
Merge "Refactor vCard: move utilities for unit tests to test_utils directory."
2010-04-19 21:08:54 -07:00
Mathias Agopian
aadc63cc42
am 732c73e1: am 26f61635: am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
2010-04-19 19:39:04 -07:00
Mathias Agopian
0ec1f2fc6e
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
2010-04-19 19:29:22 -07:00
Mathias Agopian
65d8840637
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
2010-04-19 19:26:31 -07:00
Jack Palevich
338126ce85
am 15d484a7: am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo
2010-04-19 19:24:19 -07:00
Mathias Agopian
8288f66f0a
Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
2010-04-19 19:23:45 -07:00
Jack Palevich
4ace33e248
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
2010-04-19 19:15:12 -07:00
Daisuke Miyakawa
4eb11486cf
am 72c0a3cf: (-s ours) am e3172405: am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data.
2010-04-19 19:13:12 -07:00
Jack Palevich
3956b41a04
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
2010-04-19 19:10:13 -07:00