In order to unbundle System Update, we need some to expose in the SDK
some way to reboot the device into recovery. Add a reboot() method to
PowerManager, protected by the android.permission.REBOOT permission.
Merge commit '793810f68fcf1ace817f6ebcb42a6adb13c28582' into eclair-mr2-plus-aosp
* commit '793810f68fcf1ace817f6ebcb42a6adb13c28582':
backout a workaround that is not needed anymore
Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-mr2
* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
backout a workaround that is not needed anymore
Merge commit 'fc64165ef7116a385ae6d9983ab077adc47a6326' into eclair-mr2-plus-aosp
* commit 'fc64165ef7116a385ae6d9983ab077adc47a6326':
fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Merge commit '74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-mr2
* commit '74a331b5dd1d39da44b608743c36ab3523f598d2':
fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Merge commit '57c701463f57ea50f6116690641f376e84c4c290' into eclair-mr2-plus-aosp
* commit '57c701463f57ea50f6116690641f376e84c4c290':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-mr2
* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
* changes:
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Merge commit 'eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp
* commit 'eb114de5037bba89333bd7d57d305ae989727096':
Make vCard exporter append neighborhood to locality field instead of extended address,
Merge commit '98fdda09256072ae4f45a08ee40178b3ef643c9f' into eclair-mr2-plus-aosp
* commit '98fdda09256072ae4f45a08ee40178b3ef643c9f':
If overview width is the same as the current width,
Merge commit 'f61ab00770c6010d83280644263d6f530c75028e' into eclair-mr2-plus-aosp
* commit 'f61ab00770c6010d83280644263d6f530c75028e':
-hide AccountManagerResponse, which never should have been exposed in the first place
Also sets an explicit type for GeolocationPermissions.getOrigins.
This is a partial fix for bug http://b/issue?id=2271636
Change-Id: Ife478917a979b68e242c467798358a018455957f
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-mr2
* commit '5994cd2898ad3c76d1f5068137a884024f521163':
-hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '8250530c507653d57c768677d8a542cd769aaf99' into eclair-mr2-plus-aosp
* commit '8250530c507653d57c768677d8a542cd769aaf99':
Add Gservices flag so that Market can turn on performance logging for specific groups.
Merge commit 'b0fbb7cc15a2b383b4fe1dde8117254b2056573b' into eclair-mr2-plus-aosp
* commit 'b0fbb7cc15a2b383b4fe1dde8117254b2056573b':
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView.
Merge commit '0a784a545303cc5fcd9ecbc260d1fa0d0d0b8336' into eclair-mr2-plus-aosp
* commit '0a784a545303cc5fcd9ecbc260d1fa0d0d0b8336':
When requesting the href of a link, also request the link's text.
e090281428cbd1114f4ae2f10755013cea09cdb5 Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
0e5bb7f1c9558bcf76af4f31dd5a11e78bcbdc9d PowerManagerService: Hold a wakelock while mProximityTask is queued
Change-Id: I8082b546467f839f53187534bb4264e59bd4a7db
Signed-off-by: Mike Lockwood <lockwood@android.com>
