22371 Commits

Author SHA1 Message Date
Jean-Michel Trivi
34b2ecc82a am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
Merge commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db' into froyo-plus-aosp

* commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db':
  Fix bug 2578813 Delay pausing music and routing audio for car docks
2010-04-13 09:54:47 -07:00
Gloria Wang
d4c072d3f5 am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.
Merge commit 'b19da8e187db1cf223463809148b7cb2d9e9751a' into froyo-plus-aosp

* commit 'b19da8e187db1cf223463809148b7cb2d9e9751a':
  Fix for 2581725. Keep the last frame after resume(), and delete it
2010-04-13 09:54:44 -07:00
Jean-Michel Trivi
c30890e102 Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 2010-04-13 09:53:35 -07:00
Gloria Wang
b19da8e187 Fix for 2581725. Keep the last frame after resume(), and delete it
in the next suspend() or reuse it if no new frame is available.

Change-Id: I84286030eaae9061077d6ccb485b7dd53ef05341
2010-04-13 09:46:40 -07:00
Vasu Nori
90a36726b7 let apps set statement-cache size.
1. we should let apps set their statement-cache size. right n ow it is 250
is the statement-cache size for all apps and that is wasting
a lot of memory. each prepared statement is averaging about 1k-5K,
depending upon the complexity of sql and schema.
mnake default 25 and let apps increase the size, if they need to.

2. in "adb bugreport" info, print stats on the statement-cache hits/missies
and size (in number of statement cached). this will help us understand
how statement-cache is being used

Change-Id: Ic53a2842ef75823757492778158fcb8d5b4a28bb
2010-04-13 09:45:48 -07:00
Jean-Michel Trivi
4c637b9e34 Fix bug 2578813 Delay pausing music and routing audio for car docks
Moved broadcast of ACTION_AUDIO_BECOMING_NOISY from BluetoothA2dpService
to AudioService.
Broadcast ACTION_AUDIO_BECOMING_NOISY when disconnecting an A2DP
device.
Disconnect from A2DP docks with a delay to handle transient
disconnections.
Cancel delayed A2DP disconnections when connecting to a dock as this
can be a reconnection after a transient disconnection.

Change-Id: I1ee9e99f3ffa20727af38a4c4c8711942894a696
2010-04-13 09:44:08 -07:00
Daniel Sandler
de3601e05c am bcac4960: Honor the "Never vibrate" setting for incoming calls.
Merge commit 'bcac496076ef6f439147e7a2be71e8a2b76ddede' into froyo-plus-aosp

* commit 'bcac496076ef6f439147e7a2be71e8a2b76ddede':
  Honor the "Never vibrate" setting for incoming calls.
2010-04-13 09:21:47 -07:00
Daniel Sandler
bcac496076 Honor the "Never vibrate" setting for incoming calls.
Bug: 2579295
Change-Id: Ia4207492c5dfa2c39d27372c4892b60121b6d9e8
2010-04-13 12:18:44 -04:00
Kristian Monsen
b2d95503fd Fix for 2585858, load invalid urls.
The browser currently does not try to load invalid urls, that can be a problem. Now we only check if the host is correctly encoded.

Change-Id: Ie7380c59d4faab68a2f957e7f1ba8347e15e45a1
2010-04-13 16:48:32 +01:00
Daniel Sandler
8dc634e82f am b0cc22b4: am 15683534: Merge "Hide e-call button in layout." into froyo
Merge commit 'b0cc22b4059ea49623defa1c118db9abdd59a0be' into kraken

* commit 'b0cc22b4059ea49623defa1c118db9abdd59a0be':
  Hide e-call button in layout.
2010-04-13 06:10:10 -07:00
Daniel Sandler
b0cc22b405 am 15683534: Merge "Hide e-call button in layout." into froyo
Merge commit '15683534d1f1ca76a9a59ed921219db46ff5f800' into froyo-plus-aosp

* commit '15683534d1f1ca76a9a59ed921219db46ff5f800':
  Hide e-call button in layout.
2010-04-13 06:05:20 -07:00
Daniel Sandler
15683534d1 Merge "Hide e-call button in layout." into froyo 2010-04-13 06:00:02 -07:00
Dianne Hackborn
5943c200a4 Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
...go directly to unlock screen

Fix a problem where, when we are moving windows due to a configuration
change, our wait to have the windows get redrawn would also
inadvertently make us think their surfaces should be hidden, leading
to nasty things like the lock screen thinking it should be shown
again (and thus forcing the orientation back to portrait).

Change-Id: I79057cfbc93ff59fd3558da997d4f73796e6aabe
2010-04-12 21:36:49 -07:00
Mathias Agopian
445a978554 Merge "don't hardcode "mSurface" throughout our source code" into kraken 2010-04-12 18:59:49 -07:00
Christopher Tate
7cc088232d SDK: last of the backup/restore docs content
There is probably still some editing and cleanup to do, but this takes care
of the last of the "need this documented by the time we ship!" material.

Bug #2465360

Change-Id: Ic4ce9e5a07c79aa2b584a18012a2e8fe199c19fd
2010-04-12 18:24:05 -07:00
Andreas Huber
275e0662c1 am 63642b12: am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 2010-04-12 17:28:48 -07:00
Andreas Huber
63642b1202 am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 2010-04-12 17:25:48 -07:00
Gilles Debunne
134a67c838 Merge "Added documentation in Drawable." 2010-04-12 17:22:14 -07:00
Andreas Huber
7853c8988f am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Merge commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken

* commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
  Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
2010-04-12 17:21:33 -07:00
Andreas Huber
248ea4a9f7 am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Merge commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194' into froyo-plus-aosp

* commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194':
  Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
2010-04-12 17:18:43 -07:00
Andreas Huber
5baa5e1917 Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo 2010-04-12 17:15:32 -07:00
Gilles Debunne
1e91b3fde0 Added documentation in Drawable.
Documentation on the ConstantState added.
Removed all warnings in Eclipse.

Change-Id: Ib1daf7eef1aff5660e805483f9dcae6fcd5a595e
2010-04-12 17:09:14 -07:00
android-build SharedAccount
824e5d6b07 am e413fc11: manual merge 2010-04-12 17:01:36 -07:00
android-build SharedAccount
e413fc1148 manual merge
Change-Id: I4760b8fd2f4150441dbf15a598a6b44d9af27621
2010-04-12 16:56:30 -07:00
Carl Shapiro
cead9ca9de Add command line flags to enable lock profiling.
Change-Id: I5d1b5296020899c1af6ba5d93cece48f12173d2d
2010-04-12 16:31:59 -07:00
Mathias Agopian
8b138323d5 don't hardcode "mSurface" throughout our source code
this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.

Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
2010-04-12 16:29:36 -07:00
Christopher Tate
5c7a69c3d6 am 6a75d685: am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo
Merge commit '6a75d6850c77fb48daba7700621856605ab60569' into kraken

* commit '6a75d6850c77fb48daba7700621856605ab60569':
  SDK: more backup/restore documentation work
2010-04-12 16:23:35 -07:00
Christopher Tate
6a75d6850c am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo
Merge commit '7e8614a547eca78dd9178001f8f6c38444adf350' into froyo-plus-aosp

* commit '7e8614a547eca78dd9178001f8f6c38444adf350':
  SDK: more backup/restore documentation work
2010-04-12 16:18:16 -07:00
Scott Main
9aa74f5942 am 10bb4990: am 3f371793: Merge "docs: fix bug 2590728" into froyo
Merge commit '10bb4990f3b13070e6cb7ec98761041679551338' into kraken

* commit '10bb4990f3b13070e6cb7ec98761041679551338':
  docs: fix bug 2590728
2010-04-12 16:15:42 -07:00
Christopher Tate
7e8614a547 Merge "SDK: more backup/restore documentation work" into froyo 2010-04-12 16:14:53 -07:00
Scott Main
10bb4990f3 am 3f371793: Merge "docs: fix bug 2590728" into froyo
Merge commit '3f371793287b6f10badc018fb9eaca33ac51a8e7' into froyo-plus-aosp

* commit '3f371793287b6f10badc018fb9eaca33ac51a8e7':
  docs: fix bug 2590728
2010-04-12 16:12:24 -07:00
Scott Main
3f37179328 Merge "docs: fix bug 2590728" into froyo 2010-04-12 16:09:28 -07:00
Andreas Huber
d0332ad8d2 Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af
related-to-bug: 2587341
2010-04-12 16:05:57 -07:00
Scott Main
ef4ca45340 docs: fix bug 2590728
Change-Id: I997c4fd3b3fbe33f479c3fe15b8164370c0a18af
2010-04-12 16:05:49 -07:00
Amith Yamasani
cd66caf015 Fix an upgrade bug in SettingsProvider.
Bug: 2569112

Wrong usage of local method.

Change-Id: I9d7c68baa7cf8dd2b7e4345555c1edc374de94e6
2010-04-12 15:49:12 -07:00
Christopher Tate
4e14a82912 SDK: more backup/restore documentation work
Still not complete, but here's a lot more of the necessary documentation.
Submitting a checkpoint seems prudent.

Bug #2465360

Change-Id: Ifff60d57e4b24cee21f3a34f5f50e290d377c386
2010-04-12 15:42:16 -07:00
Jean-Baptiste Queru
36ce643dbe am cd839752: manual merge 2010-04-12 15:38:08 -07:00
Gilles Debunne
7ffa6a038f Merge "Fixed links in MipmapDrawable documentation." 2010-04-12 15:36:59 -07:00
Gilles Debunne
20fc9bfe3a Fixed links in MipmapDrawable documentation.
Fix for 78aaa97b77d56e35e994611406deb398eb9005db

Change-Id: I3b4a3b987560d5d3934776cdc7ae98c954bfab32
2010-04-12 15:33:49 -07:00
Jean-Baptiste Queru
cd8397524a manual merge
Change-Id: I9cdacbf1e445e7f6cf06ad03df541a744c242774
2010-04-12 15:32:13 -07:00
Christopher Tate
c47f4be6c7 am 7fef3c57: am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit '7fef3c57eb6f5fbef65dd553ea49d93111d595da' into kraken

* commit '7fef3c57eb6f5fbef65dd553ea49d93111d595da':
  API CHANGE: remove obsolete constants and hide some methods
2010-04-12 15:19:16 -07:00
Christopher Tate
7fef3c57eb am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp

* commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a':
  API CHANGE: remove obsolete constants and hide some methods
2010-04-12 15:16:07 -07:00
Christopher Tate
b9e3e4ce7e Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo 2010-04-12 15:13:35 -07:00
Robert Greenwalt
2a7b730378 Fix Throttle Notification intents
Now goes to the correct settings page.

bug:2576057
Change-Id: I21df0e53f7f56ae9bf71f983a3aed200c5ac217d
2010-04-12 14:56:31 -07:00
android-build SharedAccount
bc3f538941 am 1a22ec9f: Merge commit \'36c87ca65281bbbeeed1b25da52468fe52491a7d\' into kraken-plus-aosp 2010-04-12 14:50:14 -07:00
android-build SharedAccount
40b91319cc am 270027bf: Merge commit \'e8985420bb0fb95ad6dadd6de84f9940ecbd5ab7\' into kraken-plus-aosp 2010-04-12 14:50:10 -07:00
android-build SharedAccount
1a22ec9f69 Merge commit '36c87ca65281bbbeeed1b25da52468fe52491a7d' into kraken-plus-aosp 2010-04-12 14:47:38 -07:00
android-build SharedAccount
270027bfa4 Merge commit 'e8985420bb0fb95ad6dadd6de84f9940ecbd5ab7' into kraken-plus-aosp 2010-04-12 14:46:11 -07:00
Andreas Huber
fac0c29e5a am 98c5bd55: am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo
Merge commit '98c5bd5556f32a237d3483fb7298284869e32a40' into kraken

* commit '98c5bd5556f32a237d3483fb7298284869e32a40':
  Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
2010-04-12 14:23:31 -07:00
Andreas Huber
98c5bd5556 am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo
Merge commit '6dbf80d086d03d95c5f6331719edd6dd6dac0361' into froyo-plus-aosp

* commit '6dbf80d086d03d95c5f6331719edd6dd6dac0361':
  Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
2010-04-12 14:19:23 -07:00