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

Merge "Don't auto-restart face auth after successful auth" into rvc-qpr-dev am: b3929f1e19

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

Change-Id: If50fe417f115b59f603476f21b9f13b34be2e35a
This commit is contained in:
TreeHugger Robot
2020-07-23 00:11:08 +00:00
committed by Automerger Merge Worker
parent 6d5c0ed4ee b3929f1e19
commit 05c29c86ed
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,11 +286,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
private final Executor mBackgroundExecutor; private final Executor mBackgroundExecutor;
/** /**
* Short delay before restarting biometric authentication after a successful try * Short delay before restarting fingerprint authentication after a successful try. This should
* This should be slightly longer than the time between on<biometric>Authenticated * be slightly longer than the time between onFingerprintAuthenticated and
* (e.g. onFingerprintAuthenticated) and setKeyguardGoingAway(true). * setKeyguardGoingAway(true).
*/ */
private static final int BIOMETRIC_CONTINUE_DELAY_MS = 500; private static final int FINGERPRINT_CONTINUE_DELAY_MS = 500;
// If the HAL dies or is unable to authenticate, keyguard should retry after a short delay // If the HAL dies or is unable to authenticate, keyguard should retry after a short delay
private int mHardwareFingerprintUnavailableRetryCount = 0; private int mHardwareFingerprintUnavailableRetryCount = 0;
@@ -598,7 +598,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
} }
mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_BIOMETRIC_AUTHENTICATION_CONTINUE), mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_BIOMETRIC_AUTHENTICATION_CONTINUE),
BIOMETRIC_CONTINUE_DELAY_MS); FINGERPRINT_CONTINUE_DELAY_MS);
// Only authenticate fingerprint once when assistant is visible // Only authenticate fingerprint once when assistant is visible
mAssistantVisible = false; mAssistantVisible = false;
@@ -780,9 +780,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
} }
} }
mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_BIOMETRIC_AUTHENTICATION_CONTINUE),
BIOMETRIC_CONTINUE_DELAY_MS);
// Only authenticate face once when assistant is visible // Only authenticate face once when assistant is visible
mAssistantVisible = false; mAssistantVisible = false;