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.
This commit is contained in:
Mike Lockwood
2010-01-14 17:24:48 -08:00
committed by Android Git Automerger

View File

@@ -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"));