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 | 3cdda0c3d70be76ff813f9085a3da2aa68b718e3 (patch) | |
| tree | 4a839bbb65a28e77478a1ad9754f98f783679598 /policy/com | |
| parent | 9c20d0e91bb5c0b7c540ba2f0d6c9b8add979d6f (diff) | |
| parent | fabc9b6a6c331ba5df9e76035e8a8b89350aa8df (diff) | |
| download | frameworks_base-3cdda0c3d70be76ff813f9085a3da2aa68b718e3.zip frameworks_base-3cdda0c3d70be76ff813f9085a3da2aa68b718e3.tar.gz frameworks_base-3cdda0c3d70be76ff813f9085a3da2aa68b718e3.tar.bz2 | |
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.
Diffstat (limited to 'policy/com')
| -rwxr-xr-x | policy/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java index 659b2bb..aa86d3d 100755 --- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/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")); |