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

Make sure to call dismissKeyguard after setOccluded

Browse Source 
am: ec50931d88

Change-Id: Ib25480fa4efe63940fed144f4e28dee185244fad
This commit is contained in:
Jorim Jaggi
2016-10-25 23:39:25 +00:00
committed by android-build-merger
parent 299b57410d ec50931d88
commit 1d4f2b9914
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5410,18 +5410,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
} else if (mDismissKeyguard != DISMISS_KEYGUARD_NONE) {
mKeyguardHidden = false;
boolean willDismiss = false;
boolean dismissKeyguard = false;
final boolean trusted = mKeyguardDelegate.isTrusted();
if (mDismissKeyguard == DISMISS_KEYGUARD_START) {
final boolean trusted = mKeyguardDelegate.isTrusted();
willDismiss = trusted && mKeyguardOccluded && mKeyguardDelegate != null
&& mKeyguardDelegate.isShowing();
final boolean willDismiss = trusted && mKeyguardOccluded
&& mKeyguardDelegate != null && mKeyguardDelegate.isShowing();
if (willDismiss) {
mCurrentlyDismissingKeyguard = true;
}
// Only launch the next keyguard unlock window once per window.
mHandler.post(() -> mKeyguardDelegate.dismiss(
trusted /* allowWhileOccluded */));
dismissKeyguard = true;
}
// If we are currently dismissing Keyguard, there is no need to unocclude it.
@@ -5432,6 +5429,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
| FINISH_LAYOUT_REDO_WALLPAPER;
}
}
if (dismissKeyguard) {
// Only launch the next keyguard unlock window once per window.
mHandler.post(() -> mKeyguardDelegate.dismiss(
trusted /* allowWhileOccluded */));
}
} else {
mWinDismissingKeyguard = null;
mSecureDismissingKeyguard = false;