commit 95c6daed397f658039184cf83755c245fb4b5dcd
author Jorim Jaggi <jjaggi@google.com> Wed Jul 29 15:17:23 2015 -0700
committer Jorim Jaggi <jjaggi@google.com> Wed Jul 29 23:41:16 2015 +0000
tree 57354ce0d3a878f6dcc4f6519b9579fe2e3b2ee3
parent e8246ff7443ec0d1acd7f3637c28fa066779638b

Fix doze mode

Make sure to reset the keyguard drawn state in the correct place,
so we don't return early in finishKeyguardDrawn() because
mKeyguardDrawComplete is still true.

Bug: 22808662
Change-Id: I7e18e91c412c6cac7fe253837949602f76b7f270

services/core/java/com/android/server/policy/PhoneWindowManager.java

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index a800e18d..da8fb70 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -5469,7 +5469,6 @@
         // the wake lock and let the system suspend once this function returns.
         synchronized (mLock) {
             mAwake = false;
-            mKeyguardDrawComplete = false;
             updateWakeGestureListenerLp();
             updateOrientationListenerLp();
             updateLockScreenTimeout();
@@ -5491,7 +5490,6 @@
         // may happen in a future call to goToSleep.
         synchronized (mLock) {
             mAwake = true;
-            mKeyguardDrawComplete = false;
             if (mKeyguardDelegate != null) {
                 mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);
                 mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, 1000);
@@ -5560,6 +5558,7 @@
         synchronized (mLock) {
             mScreenOnEarly = false;
             mScreenOnFully = false;
+            mKeyguardDrawComplete = false;
             mWindowManagerDrawComplete = false;
             mScreenOnListener = null;
             updateOrientationListenerLp();
@@ -5579,6 +5578,7 @@
         synchronized (mLock) {
             mScreenOnEarly = true;
             mScreenOnFully = false;
+            mKeyguardDrawComplete = false;
             mWindowManagerDrawComplete = false;
             mScreenOnListener = screenOnListener;