Merge commit '9a5985a8d975f88e314a321392cc7e25bd14ad0e' into eclair-mr2-plus-aosp
* commit '9a5985a8d975f88e314a321392cc7e25bd14ad0e':
Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox.
Merge commit '0036b4def5242429abdf6e8e420896eb5296316e' into eclair-mr2-plus-aosp
* commit '0036b4def5242429abdf6e8e420896eb5296316e':
Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871' into eclair-plus-aosp
* commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871':
Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871' into eclair-mr2
* commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871':
Fix bug 2252145 - Notification panel not closing completely when a call comes in
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 'f36b8f439babc141970b1207d1d9c12b7a14c468' into eclair-plus-aosp
* commit 'f36b8f439babc141970b1207d1d9c12b7a14c468':
This time for sure: make wallpapers work
Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-plus-aosp
* 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
Merge commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404' into eclair-plus-aosp
* 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.
