Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cdda0c3 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

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.
parents 9c20d0e9 fabc9b6a

policy/com/android/internal/policy/impl/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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"));