Merge "Never show the alternate bouncer if the primary bouncer is showing" into main (9a777c84) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractorTest.kt

+9 −1

Original line number	Diff line number	Diff line
		@@ -139,6 +139,14 @@ class AlternateBouncerInteractorTest : SysuiTestCase() {
		assertFalse(underTest.canShowAlternateBouncerForFingerprint())
		}

		@Test
		fun canShowAlternateBouncerForFingerprint_primaryBouncerShowing() {
		givenCanShowAlternateBouncer()
		bouncerRepository.setPrimaryShow(true)

		assertFalse(underTest.canShowAlternateBouncerForFingerprint())
		}

		@Test
		fun show_whenCannotShow() {
		givenCannotShowAlternateBouncer()
		@@ -202,7 +210,7 @@ class AlternateBouncerInteractorTest : SysuiTestCase() {
		} else {
		bouncerRepository.setAlternateBouncerUIAvailable(true)
		}

		bouncerRepository.setPrimaryShow(false)
		biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true)
		biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true)
		whenever(keyguardUpdateMonitor.isFingerprintLockedOut).thenReturn(false)

+2 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,8 @@ constructor(
		biometricSettingsRepository.isFingerprintAuthCurrentlyAllowed.value &&
		!keyguardUpdateMonitor.isFingerprintLockedOut &&
		!keyguardStateController.isUnlocked &&
		!statusBarStateController.isDozing
		!statusBarStateController.isDozing &&
		!bouncerRepository.primaryBouncerShow.value
		}

		/**