diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-01-21 14:29:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-21 14:29:32 -0800 |
| commit | 8ce3b810dcd1a40a599dd7ff5de8aea0e9758d52 (patch) | |
| tree | 025c24b4e8fba6ec5321ab86150ff527c4e71f95 | |
| parent | b125cb8b4d0ad1e96edc49929c061dd6b689d662 (diff) | |
| parent | 5fdf6a917c563df953c5215fe00b6ae8fe70a501 (diff) | |
| download | base-8ce3b810dcd1a40a599dd7ff5de8aea0e9758d52.tar.gz | |
am 5fdf6a91: am 5b2151ae: Do not turn off screen immediately after undocking.
Merge commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501'
* commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501':
Do not turn off screen immediately after undocking.
| -rwxr-xr-x | phone/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phone/com/android/internal/policy/impl/PhoneWindowManager.java b/phone/com/android/internal/policy/impl/PhoneWindowManager.java index 659b2bb..aa86d3d 100755 --- a/phone/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/phone/com/android/internal/policy/impl/PhoneWindowManager.java @@ -514,7 +514,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE); mBroadcastWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "PhoneWindowManager.mBroadcastWakeLock"); - mDockWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, + mDockWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE, "PhoneWindowManager.mDockWakeLock"); mDockWakeLock.setReferenceCounted(false); mEnableShiftMenuBugReports = "1".equals(SystemProperties.get("ro.debuggable")); |