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

Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2016-10-25 23:32:54 +00:00
committed by Android (Google) Code Review
parent db1fd054d2 ec50931d88
commit 7e8fc05295
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

@@ -5293,18 +5293,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.
@@ -5315,6 +5312,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;