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

Merge "Prevent fingerprint icon from showing when unlocking while fingerprint is in lockout." into sc-dev

Browse Source
This commit is contained in:
Joe Bolinger
2021-07-28 17:11:33 +00:00
committed by Android (Google) Code Review
parent c2d9287c97 3e22b1d62a
commit 598a7988be
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -149,7 +149,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
private static final boolean DEBUG_SIM_STATES = KeyguardConstants.DEBUG_SIM_STATES;
private static final boolean DEBUG_FACE = Build.IS_DEBUGGABLE;
private static final boolean DEBUG_SPEW = false;
private static final int LOW_BATTERY_THRESHOLD = 20;
private static final int FINGERPRINT_LOCKOUT_RESET_DELAY_MS = 600;
private static final String ACTION_FACE_UNLOCK_STARTED
= "com.android.facelock.FACE_UNLOCK_STARTED";
@@ -834,7 +834,18 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
private void handleFingerprintLockoutReset() {
mFingerprintLockedOut = false;
mFingerprintLockedOutPermanent = false;
updateFingerprintListeningState();
if (isUdfpsEnrolled()) {
// TODO(b/194825098): update the reset signal(s)
// A successful unlock will trigger a lockout reset, but there is no guarantee
// that the events will arrive in a particular order. Add a delay here in case
// an unlock is in progress. In this is a normal unlock the extra delay won't
// be noticeable.
mHandler.postDelayed(this::updateFingerprintListeningState,
FINGERPRINT_LOCKOUT_RESET_DELAY_MS);
} else {
updateFingerprintListeningState();
}
}
private void setFingerprintRunningState(int fingerprintRunningState) {