diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-01-14 17:24:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-14 17:24:48 -0800 |
| commit | 5fdf6a917c563df953c5215fe00b6ae8fe70a501 (patch) | |
| tree | 3ee7395ceea3d81571b1942b0e0f7ad0a4a95b34 | |
| parent | a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7 (diff) | |
| parent | 5b2151ae8654f63bd25e05e87f872ec6f78f0519 (diff) | |
| download | base-5fdf6a917c563df953c5215fe00b6ae8fe70a501.tar.gz | |
am 5b2151ae: Do not turn off screen immediately after undocking.
Merge commit '5b2151ae8654f63bd25e05e87f872ec6f78f0519' into eclair-plus-aosp
* commit '5b2151ae8654f63bd25e05e87f872ec6f78f0519':
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 27a42bc..27278e0 100755 --- a/phone/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/phone/com/android/internal/policy/impl/PhoneWindowManager.java @@ -511,7 +511,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")); |