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"

Browse Source 
am: a6e5165b2c

Change-Id: I8e198596eaec74fb022530544adad8efa0aadf52
This commit is contained in:
Jorim Jaggi
2018-02-23 18:08:13 +00:00
committed by android-build-merger
parent f535f8108d a6e5165b2c
commit 94ec9e3e4b
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; mWindowManagerDrawComplete = false;
mScreenOnListener = screenOnListener; mScreenOnListener = screenOnListener;
if (mKeyguardDelegate != null) { if (mKeyguardDelegate != null && mKeyguardDelegate.hasKeyguard()) {
mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT); mHandler.removeMessages(MSG_KEYGUARD_DRAWN_TIMEOUT);
mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT, mHandler.sendEmptyMessageDelayed(MSG_KEYGUARD_DRAWN_TIMEOUT,
getKeyguardDrawnTimeout()); getKeyguardDrawnTimeout());

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

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