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

Commit 902f6c5b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27952507'] into 24Q3-release. 

Change-Id: I5999f5f1533b4fad3d30e77882baa287d26d628a
parents 19108729 46f11389

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepositoryTest.kt

+24 −0
Original line number Diff line number Diff line
@@ -527,6 +527,30 @@ class BiometricSettingsRepositoryTest : SysuiTestCase() { 
        whenever(authController.isFaceAuthEnrolled(userId)).thenReturn(true)

    }



    @Test

    fun userChange_isFingerprintEnrolledAndEnabledUpdated() =

        testScope.runTest {

            createBiometricSettingsRepository()

            whenever(authController.isFingerprintEnrolled(ANOTHER_USER_ID)).thenReturn(false)

            whenever(authController.isFingerprintEnrolled(PRIMARY_USER_ID)).thenReturn(true)



            verify(biometricManager)

                .registerEnabledOnKeyguardCallback(biometricManagerCallback.capture())

            val isFingerprintEnrolledAndEnabled =

                collectLastValue(underTest.isFingerprintEnrolledAndEnabled)

            biometricManagerCallback.value.onChanged(true, ANOTHER_USER_ID)

            runCurrent()

            userRepository.setSelectedUserInfo(ANOTHER_USER)

            runCurrent()

            assertThat(isFingerprintEnrolledAndEnabled()).isFalse()



            biometricManagerCallback.value.onChanged(true, PRIMARY_USER_ID)

            runCurrent()

            userRepository.setSelectedUserInfo(PRIMARY_USER)

            runCurrent()

            assertThat(isFingerprintEnrolledAndEnabled()).isTrue()

        }



    @Test

    fun userChange_biometricEnabledChange_handlesRaceCondition() =

        testScope.runTest {

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepository.kt

+24 −26
Original line number Diff line number Diff line
@@ -188,8 +188,7 @@ constructor( 
        )



    private val isFingerprintEnrolled: Flow<Boolean> =

        selectedUserId

            .flatMapLatest { currentUserId ->

        selectedUserId.flatMapLatest { currentUserId ->

            conflatedCallbackFlow {

                val callback =

                    object : AuthController.Callback {
@@ -208,15 +207,14 @@ constructor( 
                        }

                    }

                authController.addCallback(callback)

                trySendWithFailureLogging(

                    authController.isFingerprintEnrolled(currentUserId),

                    TAG,

                    "Initial value of fingerprint enrollment"

                )

                awaitClose { authController.removeCallback(callback) }

            }

        }

            .stateIn(

                scope,

                started = SharingStarted.Eagerly,

                initialValue =

                    authController.isFingerprintEnrolled(userRepository.getSelectedUserInfo().id)

            )



    private val isFaceEnrolled: Flow<Boolean> =

        selectedUserId.flatMapLatest { selectedUserId: Int ->