summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-07-24 12:32:42 -0700
committerJorim Jaggi <jjaggi@google.com>2015-07-25 01:42:29 +0000
commitf325548992d449a2da564216191edb5ad2773bfd (patch)
tree7996d55c3b5b39d35c039295d0abe9df3deac6d9 /services
parent2a493532e6ce44fd6dec07a22c3a016de80ccc46 (diff)
downloadframeworks_base-f325548992d449a2da564216191edb5ad2773bfd.zip
frameworks_base-f325548992d449a2da564216191edb5ad2773bfd.tar.gz
frameworks_base-f325548992d449a2da564216191edb5ad2773bfd.tar.bz2
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
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index dc3e2d6..d12481c 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.
}