Merge "Don't auto-restart face auth after successful auth" into rvc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b3929f1e19
@@ -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;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user