Jean-Michel Trivi
13b18fd7f9
Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
...
sound.
This CL doesn't fix why mView can be null in the first place, but
prevents a crash when mView is null and a UI sound is to be played.
Change-Id: I74ea03567e8e6ebebb6c95c80a473abf11e1163d
2010-05-05 09:37:41 -07:00
Scott Main
c3039a1e9c
am 26dfbb67: am 9aa12f85: am a69e10db: fix doc bug in hello gallery tutorial
2010-05-05 09:31:40 -07:00
Scott Main
26dfbb6757
am 9aa12f85: am a69e10db: fix doc bug in hello gallery tutorial
...
Merge commit '9aa12f85bef352bbc528fbee2ccd7350a2f30394' into kraken
* commit '9aa12f85bef352bbc528fbee2ccd7350a2f30394':
fix doc bug in hello gallery tutorial
2010-05-05 09:29:39 -07:00
Scott Main
9aa12f85be
am a69e10db: fix doc bug in hello gallery tutorial
...
Merge commit 'a69e10db2fb58deb5e27aa67c46d267af928374b' into froyo-plus-aosp
* commit 'a69e10db2fb58deb5e27aa67c46d267af928374b':
fix doc bug in hello gallery tutorial
2010-05-05 09:27:50 -07:00
Daisuke Miyakawa
5763c1f501
Call register_localized_collators() with the current locale.
...
Make JNI function for setLocale() call register_localized_collators()
with the current locale, not previous one, every time it is possible.
This is a partial cherry-pick of b945639d0c3fa1850c07a2b80f476c8d242a8bde
BUG: 2514026
Change-Id: I584f1f68814dc084e699714e9d14a034123b49da
2010-05-05 09:01:48 -07:00
Scott Main
a69e10db2f
fix doc bug in hello gallery tutorial
...
Change-Id: I05ff14f7b15a8fd338dec8004912845eebe94347
2010-05-05 08:58:09 -07:00
Steve Block
fe66eef15c
Merge "Roll back the update to the WebKit UA string"
2010-05-05 07:28:37 -07:00
Dianne Hackborn
c2da11d826
Merge "Set alpha value for newly created dim surface."
2010-05-04 23:58:26 -07:00
Dianne Hackborn
9bbc568301
am d9d009d7: am 3445dae3: am 65b2561c: Merge "Fix issue #2643754 : Launcher is caching widget layouts for too long" into froyo
2010-05-04 22:20:16 -07:00
Bjorn Bringert
9dc44de5a9
am b6179a70: am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo
2010-05-04 22:20:12 -07:00
Dianne Hackborn
d9d009d721
am 3445dae3: am 65b2561c: Merge "Fix issue #2643754 : Launcher is caching widget layouts for too long" into froyo
...
Merge commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2' into kraken
* commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2':
Fix issue #2643754 : Launcher is caching widget layouts for too long
2010-05-04 18:30:51 -07:00
Bjorn Bringert
b6179a7069
am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo
...
Merge commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b' into kraken
* commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b':
Build searchables list after boot
2010-05-04 18:30:47 -07:00
Dianne Hackborn
3445dae3f5
am 65b2561c: Merge "Fix issue #2643754 : Launcher is caching widget layouts for too long" into froyo
...
Merge commit '65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp
* commit '65b2561c3bd74b639df0fead2041c775b7f40000':
Fix issue #2643754 : Launcher is caching widget layouts for too long
2010-05-04 18:22:39 -07:00
Bjorn Bringert
0c698e6e78
am c9dc1090: Merge "Build searchables list after boot" into froyo
...
Merge commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp
* commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf':
Build searchables list after boot
2010-05-04 18:22:36 -07:00
Daniel Sandler
5748ab3d8d
am 59bfdab3: am f24e66db: am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
2010-05-04 17:46:19 -07:00
Dan Morrill
da3ae8c193
am 69a07917: am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
2010-05-04 17:46:13 -07:00
Joe Onorato
7604f54733
am 6cb9d189: am 07779ac1: am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated.
2010-05-04 17:46:05 -07:00
Dianne Hackborn
65b2561c3b
Merge "Fix issue #2643754 : Launcher is caching widget layouts for too long" into froyo
2010-05-04 17:43:25 -07:00
Dianne Hackborn
4416c3d6e4
Fix issue #2643754 : Launcher is caching widget layouts for too long
...
With the .apk file names now changing during an update, we need
to make sure to flush all caches related to a package when the
package is removed. Otherwise we can continue to use the old
package, since its old file may still exist if we try to load it
too soon.
Change-Id: I15f08dffca3feac999dbca4f24bef12a30ca0a66
2010-05-04 17:22:49 -07:00
Bjorn Bringert
c9dc10908a
Merge "Build searchables list after boot" into froyo
2010-05-04 16:57:56 -07:00
Joe Malin
384abb1fbe
Merge "Doc Change: Activity Testing/Hello, Testing tutorials doc files Change-ID: bddebe3eaaf722e2bd2a56d473b76a0a8e061053 Author: Joe Malin <jmalin@google.com> Date: Mon Mar 1 18:24:14 2010 -0800"
2010-05-04 16:16:24 -07:00
Scott Main
7c88e59db7
am 51867f23: am 0915d0aa: am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo
2010-05-04 16:08:42 -07:00
Scott Main
51867f2313
am 0915d0aa: am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo
...
Merge commit '0915d0aa9c13b365d48c6868ac47913ecd172d07' into kraken
* commit '0915d0aa9c13b365d48c6868ac47913ecd172d07':
docs: resolve doc bug
2010-05-04 16:06:57 -07:00
Scott Main
0915d0aa9c
am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo
...
Merge commit '5e5202bd6f9e7687fc6399762529b0ef5625e515' into froyo-plus-aosp
* commit '5e5202bd6f9e7687fc6399762529b0ef5625e515':
docs: resolve doc bug
2010-05-04 16:04:46 -07:00
Scott Main
5e5202bd6f
Merge "docs: resolve doc bug bug:2648699" into froyo
2010-05-04 16:03:37 -07:00
Jaikumar Ganesh
94278c9fd2
Add UUID property for adapter.
...
4.64 version of Bluez has the UUID property of adapter being reported.
Change-Id: Ibf451a14d58620ba8bea812cd302be0b4def5f74
2010-05-04 15:57:50 -07:00
Jaikumar Ganesh
819a3e220c
am c0cec624: Fix runtime reboot when connecting to a A2DP headset and user toggles BT state.
2010-05-04 15:57:45 -07:00
Jaikumar Ganesh
c0cec62454
Fix runtime reboot when connecting to a A2DP headset and
...
user toggles BT state.
Bug:2607218
This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.
Change-Id: Icf0abeb3dfc794bb3371b1c427aa15755fbe84c7
2010-05-04 15:56:11 -07:00
Jaikumar Ganesh
1aea42aecc
am ca4d4de8: Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken
2010-05-04 15:55:02 -07:00
Jaikumar Ganesh
ca4d4de865
Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken
2010-05-04 15:53:31 -07:00
Jaikumar Ganesh
9997f66f62
Revert "Fix runtime reboot when connecting to a A2DP headset and"
...
This reverts commit 55b0110fc298c403887b1311d7eabfffa230495f.
2010-05-04 15:52:42 -07:00
Bjorn Bringert
2c7b197a4a
Build searchables list after boot
...
This avoids delaying the first launch of QuickSearchBox or Browser
after boot while SearchManagerService builds the searchables list.
Bug http://b/issue?id=2639863
Change-Id: Ia510204691ecf487a2008723fe8f6caaced86618
2010-05-04 23:49:24 +01:00
Adam Powell
b7e23dbef3
am 37f4f5b1: am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:43:14 -07:00
Adam Powell
37f4f5b1ea
am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
...
Merge commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d' into kraken
* commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d':
Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:41:41 -07:00
Adam Powell
d135f74b97
am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
...
Merge commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp
* commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:40:36 -07:00
Jaikumar Ganesh
fb50b1ce34
am 55b0110f: Fix runtime reboot when connecting to a A2DP headset and user toggles BT state.
2010-05-04 15:31:16 -07:00
Jaikumar Ganesh
55b0110fc2
Fix runtime reboot when connecting to a A2DP headset and
...
user toggles BT state.
Bug:2607218
This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.
Change-Id: I023406ec6d59880754ca4f1de676d0dce71b13c6
2010-05-04 15:28:27 -07:00
Jean-Baptiste Queru
f32cdca3cf
Merge "Fix for bug 2467152 files with spaces fail to open."
2010-05-04 15:16:32 -07:00
James Dong
b8a8f85027
am 8d30b2d2: Merge "Support AAC recording" into kraken
2010-05-04 14:52:57 -07:00
Andreas Huber
d818d52f1b
am ce0bd717: am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
2010-05-04 14:52:47 -07:00
Scott Main
d582694cbf
am ebad36db: am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
2010-05-04 14:52:43 -07:00
Adam Powell
151af19bf4
Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
...
Change-Id: I841a37349fbc6af33073aaecae903eb8999cc5bd
2010-05-04 14:44:45 -07:00
James Dong
8d30b2d284
Merge "Support AAC recording" into kraken
2010-05-04 14:40:28 -07:00
Andreas Huber
ce0bd71735
am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
...
Merge commit '8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken
* commit '8ea45aad100ee25067b2e83703454c71a968ba4f':
Support for Ogg Vorbis decoding in stagefright.
2010-05-04 14:30:34 -07:00
Andreas Huber
8ea45aad10
am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
...
Merge commit 'e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp
* commit 'e083d0a2f50906423ab548047d436c74648fc488':
Support for Ogg Vorbis decoding in stagefright.
2010-05-04 14:29:04 -07:00
Andreas Huber
e083d0a2f5
Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
2010-05-04 14:27:26 -07:00
Scott Main
ebad36db56
am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
...
Merge commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken
* commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3':
docs: revise and add documentation for backup APIs
2010-05-04 14:22:47 -07:00
Scott Main
5c16039adf
am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
...
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp
* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
docs: revise and add documentation for backup APIs
2010-05-04 14:21:21 -07:00
Scott Main
014517569f
Merge "docs: revise and add documentation for backup APIs" into froyo
2010-05-04 14:20:02 -07:00
Shimeng (Simon) Wang
475cfa74a0
Merge "Remove svg from ignored rendertree tests list."
2010-05-04 13:53:48 -07:00