Merge "Don't auto-restart face auth after successful auth" into rvc-qpr-dev (b3929f1e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+5 −8

Original line number	Diff line number	Diff line
		@@ -286,11 +286,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		private final Executor mBackgroundExecutor;

		/**
		* Short delay before restarting biometric authentication after a successful try
		* This should be slightly longer than the time between on<biometric>Authenticated
		* (e.g. onFingerprintAuthenticated) and setKeyguardGoingAway(true).
		* Short delay before restarting fingerprint authentication after a successful try. This should
		* be slightly longer than the time between onFingerprintAuthenticated and
		* 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
		private int mHardwareFingerprintUnavailableRetryCount = 0;
		@@ -598,7 +598,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		}

		mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_BIOMETRIC_AUTHENTICATION_CONTINUE),
		BIOMETRIC_CONTINUE_DELAY_MS);
		FINGERPRINT_CONTINUE_DELAY_MS);

		// Only authenticate fingerprint once when assistant is visible
		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
		mAssistantVisible = false;