Merge commit '55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-plus-aosp
* commit '55896f3c5121e73e3f657ed14e7ee8937ad72449':
Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
In this case, as opposed to what was happening in 1977685, the focused view wasn't the one that was
directly removed, it was a child of the removed view.
Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-plus-aosp
* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-plus-aosp
* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
Fix pairings lost on reboot.
Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-plus-aosp
* commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d':
Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
The detach of the wallpaper engine was coming in after the containing
service was destroyed. This was possible because these are different
IPC interfaces so will not be serialized. The fix is to keep track
of all of the active engines in the serice, and detach any remaining
ones when the service is destroyed.
Change-Id: I8810786a777dd4f7b15cfbd2e0da25866a4f3ec5
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-plus-aosp
* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair
* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-plus-aosp
* commit '5994cd2898ad3c76d1f5068137a884024f521163':
-hide AccountManagerResponse, which never should have been exposed in the first place
Add optional flag to Wakelock.release() to specify whether we should wait for proximity sensor to go negative before turning on the screen.
Clear the "waiting for proximity sensor to go negative" state when the power key is pressed.
Part of the fix for b/2243198 (Black screen lockup after ending call)
Change-Id: I813fdb7aa4192cd3384a25be9e59d7d4b90da53a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Don't hold the global package log while instantiated an AssetManager+Resources, since
this is a fairly heavy-weight operation, and if done in the background can starve the
foreground.
Change-Id: I5ad37324fb7c27ffdbf28e1498ca0ad667479580
Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-plus-aosp
* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
Add vertical bar to the alt-space character picker for the hardware keyboard.
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-plus-aosp
* commit '660282dc3e81784224945be0787a9e2d4276de8c':
Check if Bluetooth is enabled before making any calls down.
There was a lock in AssetManager that purported to be per-instance (mSync)
but was actually static. A lot of code used it like it was per-instance,
but this would actually block all instances. This is now changed to fix
the name and make everything except the actual static data lock on the
specific AssetManager instance.
Change-Id: Ie8e9ad60f962184e76b2301f7a2790d0c2487063
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews. These nested views
are inflated and treated as addView() calls.
This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen. Also fixes ViewAnimator
to observe the measureAllChildren flag when set.
Fixes http://b/2239905
Merge commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae' into eclair-plus-aosp
* commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae':
fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-plus-aosp
* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
