commit a8e26b2e16f1bf800072194055ade22e1f1df4be
author Jorim Jaggi <jjaggi@google.com> Fri Feb 23 18:33:52 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 23 18:33:52 2018 +0000
tree 9e5cd3ff01c398c78ea6817bbe58039c103c1b9d
parent 6dcc9de2feebf2130f15fefd7b096b221e91bbf8
parent 239d74fa195fd047f66c9fd9f1d5ad1cdb4de62c

Merge "Don't wait keyguard drawn if device has no keyguard" am: a6e5165b2c am: 94ec9e3e4b
am: 239d74fa19

Change-Id: I19abbe828a0004888143be02fd6ca834d8013a64

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 888d885..e40dc4f 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -6705,7 +6705,7 @@
             mWindowManagerDrawComplete = false;
             mScreenOnListener = screenOnListener;
 
-            if (mKeyguardDelegate != null) {
+            if (mKeyguardDelegate != null && mKeyguardDelegate.hasKeyguard()) {
                 mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);
                 mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT,
                         getKeyguardDrawnTimeout());

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
index 18f4a3c..58e8f77 100644
--- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
+++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
@@ -242,6 +242,10 @@
         return false;
     }
 
+    public boolean hasKeyguard() {
+        return mKeyguardState.deviceHasKeyguard;
+    }
+
     public boolean isInputRestricted() {
         if (mKeyguardService != null) {
             mKeyguardState.inputRestricted = mKeyguardService.isInputRestricted();