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

Merge "SIM PIN unlock - Keyguard in invalid state" into sc-dev am: f9be814922 am: 9fb7fe0834

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15260881

Change-Id: I0d29ec0a158f38e96bfe04477a503e8f9400e011
This commit is contained in:
Matt Pietal
2021-07-13 14:27:28 +00:00
committed by Automerger Merge Worker
parent 123bf08ce9 9fb7fe0834
commit 3e4c950cff
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -1506,8 +1506,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
return;
}
// if the keyguard is already showing, don't bother
if (mKeyguardViewControllerLazy.get().isShowing()) {
// if the keyguard is already showing, don't bother. check flags in both files
// to account for the hiding animation which results in a delay and discrepancy
// between flags
if (mShowing && mKeyguardViewControllerLazy.get().isShowing()) {
if (DEBUG) Log.d(TAG, "doKeyguard: not showing because it is already showing");
resetStateLocked();
return;