Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00e06f16 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Never show the alternate bouncer if the primary bouncer is showing 

Flag: None
Test: atest AlternateBouncerInteractorTest
Test: switch users multiple times
Fixes: 326272427
Change-Id: I0517dc1ee5417a436c7363c4579bc695dee398a9
Merged-In: I0517dc1ee5417a436c7363c4579bc695dee398a9
(cherry picked from commit f24eae4e)
parent 09515aa1

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

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

        assertFalse(underTest.canShowAlternateBouncerForFingerprint())

    }

    }





    @Test

    fun canShowAlternateBouncerForFingerprint_primaryBouncerShowing() {

        givenCanShowAlternateBouncer()

        bouncerRepository.setPrimaryShow(true)



        assertFalse(underTest.canShowAlternateBouncerForFingerprint())

    }



    @Test

    @Test

    fun show_whenCannotShow() {

    fun show_whenCannotShow() {

        givenCannotShowAlternateBouncer()

        givenCannotShowAlternateBouncer()
@@ -202,7 +210,7 @@ class AlternateBouncerInteractorTest : SysuiTestCase() { 
        } else {

        } else {

            bouncerRepository.setAlternateBouncerUIAvailable(true)

            bouncerRepository.setAlternateBouncerUIAvailable(true)

        }

        }



        bouncerRepository.setPrimaryShow(false)

        biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true)

        biometricSettingsRepository.setIsFingerprintAuthEnrolledAndEnabled(true)

        biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true)

        biometricSettingsRepository.setIsFingerprintAuthCurrentlyAllowed(true)

        whenever(keyguardUpdateMonitor.isFingerprintLockedOut).thenReturn(false)

        whenever(keyguardUpdateMonitor.isFingerprintLockedOut).thenReturn(false)

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,8 @@ constructor( 
            biometricSettingsRepository.isFingerprintAuthCurrentlyAllowed.value &&

            biometricSettingsRepository.isFingerprintAuthCurrentlyAllowed.value &&

            !keyguardUpdateMonitor.isFingerprintLockedOut &&

            !keyguardUpdateMonitor.isFingerprintLockedOut &&

            !keyguardStateController.isUnlocked &&

            !keyguardStateController.isUnlocked &&

            !statusBarStateController.isDozing

            !statusBarStateController.isDozing &&

            !bouncerRepository.primaryBouncerShow.value

    }

    }





    /**

    /**