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

Browse Source
This commit is contained in:
Matt Pietal
2021-07-13 14:01:02 +00:00
committed by Android (Google) Code Review
parent 7bb7211f76 3b8d608267
commit f9be814922
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; return;
} }
// if the keyguard is already showing, don't bother // if the keyguard is already showing, don't bother. check flags in both files
if (mKeyguardViewControllerLazy.get().isShowing()) { // 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"); if (DEBUG) Log.d(TAG, "doKeyguard: not showing because it is already showing");
resetStateLocked(); resetStateLocked();
return; return;