Do not turn off screen immediately after undocking.

Change-Id: I1d01d141961d1e26d814a202745ce77678fd4518
BUG: 2356385

Signed-off-by: Mike Lockwood <lockwood@android.com>

diff --git a/phone/com/android/internal/policy/impl/PhoneWindowManager.java b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
index 27a42bc..27278e0 100755 (executable)
--- 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"));