Merge commit 'fd5cfd885da4ee883153474d43e883aac7516023' into eclair-mr2-plus-aosp
* commit 'fd5cfd885da4ee883153474d43e883aac7516023':
This time for sure: make wallpapers work
Merge commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12' into eclair-mr2-plus-aosp
* commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12':
Work on issue 2259506: camera ANRed and then device runtime restarted
Merge commit 'f36b8f439babc141970b1207d1d9c12b7a14c468' into eclair-mr2
* commit 'f36b8f439babc141970b1207d1d9c12b7a14c468':
This time for sure: make wallpapers work
Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-mr2
* commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679':
Work on issue 2259506: camera ANRed and then device runtime restarted
Merge commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404' into eclair-mr2
* commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404':
Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
PowerManagerService: Hold a wakelock while mProximityTask is queued
Do not cancel screen brightness animation in forceUserActivityLocked unless screen is turning off.
Also not turn the screen on if PowerManager.preventScreenOn(false) is called while proximity sensor is active.
Fixes b/2254818 (dim display) where due to a race condition the screen is stuck in a dim state.
Change-Id: If6f805609c8d463631b9e22805e5242714ce34c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
This prevents the device from sleeping while a deferred proximity sensor
event is pending.
Fixes b/2260005 (Proximity sensor can fail due to missing wakelock)
Change-Id: Ia4825f548b5b7d8a0b184f720b32c2f21b77b96e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'aaa8e7e633b61b221d10f21006bf2cd197004093' into eclair-mr2-plus-aosp
* commit 'aaa8e7e633b61b221d10f21006bf2cd197004093':
Add support for making a LiveWallpaper the default
Merge commit '6e0ff0c37cd293d49c3c874ee30a49b1d5902b5e' into eclair-mr2-plus-aosp
* commit '6e0ff0c37cd293d49c3c874ee30a49b1d5902b5e':
A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-plus-aosp
* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
Add support for making a LiveWallpaper the default
Merge commit '826d17c0690e086ed96f43714d731ec6e0ddcf96' into eclair-plus-aosp
* commit '826d17c0690e086ed96f43714d731ec6e0ddcf96':
A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-mr2
* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
Add support for making a LiveWallpaper the default
Merge commit '826d17c0690e086ed96f43714d731ec6e0ddcf96' into eclair-mr2
* commit '826d17c0690e086ed96f43714d731ec6e0ddcf96':
A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit '097855eb00971092ff6332aa2bf0fae71f42ab5f' into eclair-mr2-plus-aosp
* commit '097855eb00971092ff6332aa2bf0fae71f42ab5f':
PackageManager: Support secondary ABI for native code at installation time.
Merge commit '6f5ba93469bc26f33b5a260a394406970536c260' into eclair-mr2
* commit '6f5ba93469bc26f33b5a260a394406970536c260':
PackageManager: Support secondary ABI for native code at installation time.
Merge commit '6f5ba93469bc26f33b5a260a394406970536c260' into eclair-plus-aosp
* commit '6f5ba93469bc26f33b5a260a394406970536c260':
PackageManager: Support secondary ABI for native code at installation time.
The goal of this change is to allow the Package Manager to look for native
shared libraries corresponding to the CPU ABI reported by ro.product.cpu.abi2
if none was found for the CPU ABI given by ro.product.cpu.abi
This is used to support both ARMv5 and ARMv7 native code on modern ARMv7-based
devices. Typically, such a device would report a primary ABI of 'armeabi-v7a'
and a secondary one of 'armeabi', to indicate that it can run the binaries
generated for both.
The headset state indicated by HeadsetObserver in the broadcast intent ACTION_HEADSET_PLUG was not 0 or 1 as specified in the java doc but contained a bit field indicating the type of headset connected.
Modified HeadsetObserver to broacast a state conforming to java doc.
Added an extra to intent ACTION_HEADSET_PLUG to indicate if headset has a microphone or not.
Removed handling of non standard headset indications from HeadsetObserver.
Removed platform specific devices from output devices defined in AudioSystem.
Modified AudioService to use new ACTION_HEADSET_PLUG intent extra instead of bitfield in state.
Merge commit '17d176d8570f7d76532afee43853339c60fc9850' into eclair-mr2-plus-aosp
* commit '17d176d8570f7d76532afee43853339c60fc9850':
Don't back up system wallpapers.
Merge commit 'ddf157cae48a17e72e740538a981a63394ec2274' into eclair-plus-aosp
* commit 'ddf157cae48a17e72e740538a981a63394ec2274':
Don't back up system wallpapers.
Merge commit 'ddf157cae48a17e72e740538a981a63394ec2274' into eclair-mr2
* commit 'ddf157cae48a17e72e740538a981a63394ec2274':
Don't back up system wallpapers.
Also reworks this intent protocol a little bit to be much more efficient, only
requiring one broadcast per package.
Change-Id: I580de4843ebd3c7f2e6df7295a2f80d2937cef7c
