From f325548992d449a2da564216191edb5ad2773bfd Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Fri, 24 Jul 2015 12:32:42 -0700 Subject: [PATCH] Fix ambient display Due to a refactoring for touch, wake and unlock for fingerprint devices PhoneWindowManager now waits for Keyguard to draw its first frame in all cases, including when screen turns on for pulsing. However, since in this case the device is not awake, we need to check for screen on instead of awakeness when proceeding with the wake-up sequence. Without this change, screen on was blocked forever in the pulsing case. Bug: 22605235 Change-Id: Ib6089fd14b673e62347f2c9108d9a6783caa26b7 --- .../core/java/com/android/server/policy/PhoneWindowManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index dc3e2d612e00e..d12481c4e80b2 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -5527,7 +5527,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { private void finishKeyguardDrawn() { synchronized (mLock) { - if (!mAwake || mKeyguardDrawComplete) { + if (!mScreenOnEarly || mKeyguardDrawComplete) { return; // We are not awake yet or we have already informed of this event. }