Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't wait keyguard drawn if device has no keyguard" am: a6e5165b2c

Browse Source 
am: 94ec9e3e4b

Change-Id: I1391b28a04611f4e4445d53d3323fad8fb98528f
This commit is contained in:
Jorim Jaggi
2018-02-23 18:20:35 +00:00
committed by android-build-merger
parent 09da9870d0 94ec9e3e4b
commit 239d74fa19
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -6791,7 +6791,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
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());

4
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
View File

@@ -235,6 +235,10 @@ public class KeyguardServiceDelegate {
return false;
}
public boolean hasKeyguard() {
return mKeyguardState.deviceHasKeyguard;
}
public boolean isInputRestricted() {
if (mKeyguardService != null) {
mKeyguardState.inputRestricted = mKeyguardService.isInputRestricted();