Merge "Dismiss Biometric Prompt on device lock" into main (b046e9be) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.AlertDialog;
		import android.app.KeyguardManager;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.graphics.PixelFormat;
		@@ -315,6 +316,16 @@ public class AuthContainerView extends LinearLayout
		mBiometricCallback = new BiometricCallback();
		mMSDLPlayer = msdlPlayer;

		// Listener for when device locks from adaptive auth, dismiss prompt
		getContext().getSystemService(KeyguardManager.class).addKeyguardLockedStateListener(
		getContext().getMainExecutor(),
		isKeyguardLocked -> {
		if (isKeyguardLocked) {
		onStartedGoingToSleep();
		}
		}
		);

		final BiometricModalities biometricModalities = new BiometricModalities(
		Utils.findFirstSensorProperties(fpProps, mConfig.mSensorIds),
		Utils.findFirstSensorProperties(faceProps, mConfig.mSensorIds));

+14 −0

Original line number	Diff line number	Diff line
		@@ -211,6 +211,20 @@ open class AuthContainerViewTest : SysuiTestCase() {
		assertThat(root.isAttachedToWindow).isFalse()
		}

		@Test
		fun testDimissOnLock() {
		val container = initializeFingerprintContainer(addToView = true)
		assertThat(container.parent).isNotNull()
		val root = container.rootView

		// Simulate sleep/lock invocation
		container.onStartedGoingToSleep()
		waitForIdleSync()

		assertThat(container.parent).isNull()
		assertThat(root.isAttachedToWindow).isFalse()
		}

		@Test
		fun testCredentialPasswordDismissesOnBack() {
		val container = initializeCredentialPasswordContainer(addToView = true)