Commit Graph

15437 Commits

Author SHA1 Message Date
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
Mathias Agopian
3c772b706d 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
2010-04-19 19:09:03 -07:00
Jack Palevich
93bd90f80f Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo 2010-04-19 19:06:35 -07:00
Daisuke Miyakawa
592d0ec36a 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
2010-04-19 18:59:20 -07:00
Daisuke Miyakawa
4792ad978e 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
2010-04-19 18:52:07 -07:00
Grace Kloba
fb34902381 am fcc08fb8: am 8831d4dc: am 8f655cb6: Merge "Update the comment which supposed to be checked in in the last CL." into froyo 2010-04-19 16:26:50 -07:00
Grace Kloba
6aa3b38ef3 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
2010-04-19 16:19:30 -07:00
Grace Kloba
04b287b9ff 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
2010-04-19 16:15:41 -07:00
Grace Kloba
b227d97442 Merge "Update the comment which supposed to be checked in in the last CL." into froyo 2010-04-19 16:11:21 -07:00
Adam Powell
fe141cb362 am 8dc38941: am 7f30f8ab: am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 2010-04-19 15:49:44 -07:00
Adam Powell
b8b2a1336f 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.
2010-04-19 15:41:05 -07:00
Adam Powell
2ea10cdb80 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.
2010-04-19 15:38:11 -07:00
Adam Powell
6138d6b2da Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo 2010-04-19 15:33:08 -07:00
Raphael
dac0c275e4 Merge "Fix aapt to build in Windows SDK under Linux" 2010-04-19 14:53:36 -07:00
Daniel Lehmann
c85325b651 Merge "Ensure public methods exist to update the state of the UI, so that it can be set from outside" 2010-04-19 13:42:54 -07:00
Robert Greenwalt
5217c60771 am 3d27a2e6: am 2f8c9e68: am f06f2eb2: Merge "Misc fixes for throttling." into froyo 2010-04-19 13:39:01 -07:00
Robert Greenwalt
f50cb8ac5b am 2f8c9e68: am f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e' into kraken

* commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e':
  Misc fixes for throttling.
2010-04-19 13:31:24 -07:00
Grace Kloba
1eeb164e92 am 4a77f9e9: am e3ce4c89: am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo 2010-04-19 13:27:44 -07:00
Robert Greenwalt
7e06b042fb am f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768' into froyo-plus-aosp

* commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768':
  Misc fixes for throttling.
2010-04-19 13:25:46 -07:00
Grace Kloba
344945f0ce 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
2010-04-19 13:21:58 -07:00