commit | a6e5165b2c45526e02299fd24c398f763e7f17c9 | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Fri Feb 23 16:06:59 2018 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Feb 23 16:06:59 2018 +0000 |
tree | 5a8628ec805b6883943b35c7f2e30c851facf0c6 | |
parent | ab5bc3be503496bef50c72df5447fbc5969f4877 [diff] | |
parent | 0df686d2e4fdb1518c0f7cbcd3cafb5e8aee1d73 [diff] |
Merge "Don't wait keyguard drawn if device has no keyguard"
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index da14c36..d219476 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -6791,7 +6791,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());
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 5a5471b..3345649 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
@@ -235,6 +235,10 @@ return false; } + public boolean hasKeyguard() { + return mKeyguardState.deviceHasKeyguard; + } + public boolean isInputRestricted() { if (mKeyguardService != null) { mKeyguardState.inputRestricted = mKeyguardService.isInputRestricted();