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

Don't wait keyguard drawn if device has no keyguard

Browse Source 
Instead, call finishKeyguardDrawn() if device has
no keyguard to avoid redundant waiting times.

Bug: 72972510
Change-Id: Id756de05691be2593fa06d3b55e5e24ad1ea7b19
This commit is contained in:
eddy-sh.chen
2018-02-22 18:10:21 +08:00
parent 1c81aa6375
commit 0df686d2e4
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();