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

View File

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