| commit | 9a777c84407b2f1e7184d02abc984cad2179e0fa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Mar 13 16:39:44 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 13 16:39:44 2024 +0000 |
| tree | 98d110bbb7ded772c18c08d2519e0480f7b0fcf1 | |
| parent | 1f960d296c66707d45b90591914da028c0c0525b [diff] | |
| parent | f24eae4e47cfea8efa88767547689dfb78b7c1e5 [diff] |
Merge "Never show the alternate bouncer if the primary bouncer is showing" into main
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractorTest.kt index adf4fc6..b253309 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractorTest.kt
@@ -140,6 +140,14 @@ } @Test + fun canShowAlternateBouncerForFingerprint_primaryBouncerShowing() { + givenCanShowAlternateBouncer() + bouncerRepository.setPrimaryShow(true) + + assertFalse(underTest.canShowAlternateBouncerForFingerprint()) + } + + @Test fun show_whenCannotShow() { givenCannotShowAlternateBouncer() @@ -202,7 +210,7 @@ } else { bouncerRepository.setAlternateBouncerUIAvailable(true) } - + bouncerRepository.setPrimaryShow(false) biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true) biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true) whenever(keyguardUpdateMonitor.isFingerprintLockedOut).thenReturn(false)
diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractor.kt index af32eb5..000f03a 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractor.kt
@@ -109,7 +109,8 @@ biometricSettingsRepository.isFingerprintAuthCurrentlyAllowed.value && !keyguardUpdateMonitor.isFingerprintLockedOut && !keyguardStateController.isUnlocked && - !statusBarStateController.isDozing + !statusBarStateController.isDozing && + !bouncerRepository.primaryBouncerShow.value } /**