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

Commit ced63861 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Always emit latest propertiesInitialized value onStart 

Fixes: 335759591
Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor NEXTFOOD
Test: atest FingeprintPropertyRepositoryTest
Change-Id: I093f6c43a93db1048d6f8f94c0b50d8f92b21f91
parent 5876053b

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

0 → 100644
+103 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



package com.android.systemui.keyguard.data.repository



import android.hardware.fingerprint.FingerprintManager

import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.data.repository.FingerprintPropertyRepositoryImpl

import com.android.systemui.coroutines.collectLastValue

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.ArgumentCaptor

import org.mockito.Captor

import org.mockito.Mock

import org.mockito.Mockito.verify

import org.mockito.junit.MockitoJUnit

import org.mockito.junit.MockitoRule



@ExperimentalCoroutinesApi

@RunWith(AndroidJUnit4::class)

@SmallTest

class FingerprintPropertyRepositoryTest : SysuiTestCase() {

    @JvmField @Rule val mockitoRule: MockitoRule = MockitoJUnit.rule()

    private val testScope = TestScope()

    private lateinit var underTest: FingerprintPropertyRepositoryImpl

    @Mock private lateinit var fingerprintManager: FingerprintManager

    @Captor

    private lateinit var fingerprintCallbackCaptor:

        ArgumentCaptor<IFingerprintAuthenticatorsRegisteredCallback>



    @Before

    fun setup() {

        underTest =

            FingerprintPropertyRepositoryImpl(

                testScope.backgroundScope,

                Dispatchers.Main.immediate,

                fingerprintManager,

            )

    }



    @Test

    fun propertiesInitialized_onStartFalse() =

        testScope.runTest {

            val propertiesInitialized by collectLastValue(underTest.propertiesInitialized)

            assertThat(propertiesInitialized).isFalse()

        }



    @Test

    fun propertiesInitialized_onStartTrue() =

        testScope.runTest {

            //            // collect sensorType to update fingerprintCallback before

            // propertiesInitialized

            //            // is listened for

            val sensorType by collectLastValue(underTest.sensorType)

            runCurrent()

            captureFingerprintCallback()



            fingerprintCallbackCaptor.value.onAllAuthenticatorsRegistered(emptyList())

            val propertiesInitialized by collectLastValue(underTest.propertiesInitialized)

            assertThat(propertiesInitialized).isTrue()

        }



    @Test

    fun propertiesInitialized_updatedToTrue() =

        testScope.runTest {

            val propertiesInitialized by collectLastValue(underTest.propertiesInitialized)

            assertThat(propertiesInitialized).isFalse()



            captureFingerprintCallback()

            fingerprintCallbackCaptor.value.onAllAuthenticatorsRegistered(emptyList())

            assertThat(propertiesInitialized).isTrue()

        }



    private fun captureFingerprintCallback() {

        verify(fingerprintManager)

            .addAuthenticatorsRegisteredCallback(fingerprintCallbackCaptor.capture())

    }

}

packages/SystemUI/src/com/android/systemui/biometrics/data/repository/FingerprintPropertyRepository.kt

+6 −11
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ import com.android.systemui.biometrics.shared.model.SensorStrength 
import com.android.systemui.biometrics.shared.model.toSensorStrength

import com.android.systemui.biometrics.shared.model.toSensorType

import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging

import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow

import javax.inject.Inject

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope
@@ -42,6 +42,7 @@ import kotlinx.coroutines.flow.Flow 
import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.onStart

import kotlinx.coroutines.flow.stateIn

import kotlinx.coroutines.withContext
@@ -52,7 +53,7 @@ import kotlinx.coroutines.withContext 
 */

interface FingerprintPropertyRepository {

    /** Whether the fingerprint properties have been initialized yet. */

    val propertiesInitialized: StateFlow<Boolean>

    val propertiesInitialized: Flow<Boolean>



    /** The id of fingerprint sensor. */

    val sensorId: Flow<Int>
@@ -110,14 +111,8 @@ constructor( 
                initialValue = UNINITIALIZED_PROPS,

            )



    override val propertiesInitialized: StateFlow<Boolean> =

        props

            .map { it != UNINITIALIZED_PROPS }

            .stateIn(

                applicationScope,

                started = SharingStarted.WhileSubscribed(),

                initialValue = props.value != UNINITIALIZED_PROPS,

            )

    override val propertiesInitialized: Flow<Boolean> =

        props.map { it != UNINITIALIZED_PROPS }.onStart { emit(props.value != UNINITIALIZED_PROPS) }



    override val sensorId: Flow<Int> = props.map { it.sensorId }
@@ -141,7 +136,7 @@ constructor( 


    companion object {

        private const val TAG = "FingerprintPropertyRepositoryImpl"

        private val UNINITIALIZED_PROPS =

        val UNINITIALIZED_PROPS =

            FingerprintSensorPropertiesInternal(

                -2 /* sensorId */,

                SensorProperties.STRENGTH_CONVENIENCE,

packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/FingerprintPropertyInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ constructor( 
    displayStateInteractor: DisplayStateInteractor,

    udfpsOverlayInteractor: UdfpsOverlayInteractor,

) {

    val propertiesInitialized: StateFlow<Boolean> = repository.propertiesInitialized

    val propertiesInitialized: Flow<Boolean> = repository.propertiesInitialized

    val isUdfps: StateFlow<Boolean> =

        repository.sensorType

            .map { it.isUdfps() }

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardBlueprintInteractor.kt

+11 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
package com.android.systemui.keyguard.domain.interactor



import android.content.Context

import android.util.Log

import com.android.systemui.biometrics.domain.interactor.FingerprintPropertyInteractor

import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor

import com.android.systemui.dagger.SysUISingleton
@@ -42,6 +43,7 @@ import kotlinx.coroutines.flow.collect 
import kotlinx.coroutines.flow.filter

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.merge

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.launch



@SysUISingleton
@@ -78,7 +80,15 @@ constructor( 
    private val refreshEvents: Flow<Unit> =

        merge(

            configurationInteractor.onAnyConfigurationChange,

            fingerprintPropertyInteractor.propertiesInitialized.filter { it }.map { Unit },

            fingerprintPropertyInteractor.propertiesInitialized

                .filter { it }

                .map { Unit }

                .onEach {

                    Log.d(

                        "KeyguardBlueprintInteractor",

                        "triggering refreshEvent from fpPropertiesInitialized"

                    )

                },

        )



    init {