Merge "Only run face auth when the assistant becomes visible" into main (c1125d64) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1644,11 +1644,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		void setAssistantVisible(boolean assistantVisible) {
		mAssistantVisible = assistantVisible;
		mLogger.logAssistantVisible(mAssistantVisible);
		updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);
		if (mAssistantVisible) {
		if (getFaceAuthInteractor() != null) {
		getFaceAuthInteractor().onAssistantTriggeredOnLockScreen();
		}
		updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);
		if (mAssistantVisible) {
		requestActiveUnlock(
		ActiveUnlockConfig.ActiveUnlockRequestOrigin.ASSISTANT,
		"assistant",

+18 −0

Original line number	Diff line number	Diff line
		@@ -1719,6 +1719,24 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
		eq(true));
		}

		@Test
		public void assistantVisible_sendEventToFaceAuthInteractor() {
		// WHEN the assistant is visible
		mKeyguardUpdateMonitor.setAssistantVisible(true);

		// THEN send event to face auth interactor
		verify(mFaceAuthInteractor).onAssistantTriggeredOnLockScreen();
		}

		@Test
		public void assistantNotVisible_doesNotSendEventToFaceAuthInteractor() {
		// WHEN the assistant is visible
		mKeyguardUpdateMonitor.setAssistantVisible(false);

		// THEN never send event to face auth interactor
		verify(mFaceAuthInteractor, never()).onAssistantTriggeredOnLockScreen();
		}

		@Test
		public void fingerprintFailure_requestActiveUnlock_dismissKeyguard() {
		// GIVEN shouldTriggerActiveUnlock