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

Commit 6f91d5d7 authored by Chandru S's avatar Chandru S
Browse files

Trigger face auth in the new system whenever WalletActivity is launched 

Test: pending, will add manual steps to verify
Test: atest KeyguardFaceAuthInteractorTest
Fixes: 303685568
Change-Id: I04b062fd5518b2f85e70341787154dc8e7916cab
parent d4bf5dfd

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

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ interface KeyguardFaceAuthInteractor { 
    fun onSwipeUpOnBouncer()

    fun onPrimaryBouncerUserInput()

    fun onAccessibilityAction()

    fun onWalletLaunched()

}



/**

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

+1 −0
Original line number Diff line number Diff line
@@ -61,4 +61,5 @@ class NoopKeyguardFaceAuthInteractor @Inject constructor() : KeyguardFaceAuthInt 
    override fun onSwipeUpOnBouncer() {}

    override fun onPrimaryBouncerUserInput() {}

    override fun onAccessibilityAction() {}

    override fun onWalletLaunched() = Unit

}

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

+8 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.keyguard.KeyguardUpdateMonitor 
import com.android.systemui.CoreStartable

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

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

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

import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.dagger.SysUISingleton
@@ -33,7 +34,6 @@ import com.android.systemui.flags.FeatureFlags 
import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.data.repository.DeviceEntryFaceAuthRepository

import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.data.repository.KeyguardRepository

import com.android.systemui.keyguard.shared.model.ErrorFaceAuthenticationStatus

import com.android.systemui.keyguard.shared.model.FaceAuthenticationStatus

import com.android.systemui.keyguard.shared.model.TransitionState
@@ -44,6 +44,7 @@ import com.android.systemui.user.data.model.SelectionStatus 
import com.android.systemui.user.data.repository.UserRepository

import com.android.systemui.util.kotlin.pairwise

import com.android.systemui.util.kotlin.sample

import javax.inject.Inject

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.Flow
@@ -56,7 +57,6 @@ import kotlinx.coroutines.flow.map 
import kotlinx.coroutines.flow.merge

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.yield

import javax.inject.Inject



/**

 * Encapsulates business logic related face authentication being triggered for device entry from
@@ -79,7 +79,6 @@ constructor( 
    private val deviceEntryFingerprintAuthRepository: DeviceEntryFingerprintAuthRepository,

    private val userRepository: UserRepository,

    private val facePropertyRepository: FacePropertyRepository,

    private val keyguardRepository: KeyguardRepository,

    private val faceWakeUpTriggersConfig: FaceWakeUpTriggersConfig,

    private val powerInteractor: PowerInteractor,

) : CoreStartable, KeyguardFaceAuthInteractor {
@@ -207,6 +206,12 @@ constructor( 
        runFaceAuth(FaceAuthUiEvent.FACE_AUTH_ACCESSIBILITY_ACTION, false)

    }



    override fun onWalletLaunched() {

        if (facePropertyRepository.sensorInfo.value?.strength == SensorStrength.STRONG) {

            runFaceAuth(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_OCCLUDING_APP_REQUESTED, true)

        }

    }



    override fun registerListener(listener: FaceAuthenticationListener) {

        listeners.add(listener)

    }

packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java

+7 −2
Original line number Diff line number Diff line
@@ -40,12 +40,13 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.settingslib.Utils;

import com.android.systemui.res.R;

import com.android.systemui.classifier.FalsingCollector;

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

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.res.R;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.phone.KeyguardDismissUtil;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
@@ -68,6 +69,7 @@ public class WalletActivity extends ComponentActivity implements 
    private final Executor mExecutor;

    private final Handler mHandler;

    private final FalsingManager mFalsingManager;

    private final KeyguardFaceAuthInteractor mKeyguardFaceAuthInteractor;

    private FalsingCollector mFalsingCollector;

    private final UserTracker mUserTracker;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
@@ -91,7 +93,8 @@ public class WalletActivity extends ComponentActivity implements 
            UserTracker userTracker,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            StatusBarKeyguardViewManager keyguardViewManager,

            UiEventLogger uiEventLogger) {

            UiEventLogger uiEventLogger,

            KeyguardFaceAuthInteractor keyguardFaceAuthInteractor) {

        mKeyguardStateController = keyguardStateController;

        mKeyguardDismissUtil = keyguardDismissUtil;

        mActivityStarter = activityStarter;
@@ -103,6 +106,7 @@ public class WalletActivity extends ComponentActivity implements 
        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mKeyguardViewManager = keyguardViewManager;

        mUiEventLogger = uiEventLogger;

        mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor;

    }



    @Override
@@ -209,6 +213,7 @@ public class WalletActivity extends ComponentActivity implements 
                true,

                Utils.getColorAttrDefaultColor(

                        this, com.android.internal.R.attr.colorAccentPrimary));

        mKeyguardFaceAuthInteractor.onWalletLaunched();

        mKeyguardViewManager.requestFace(true);

    }

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

+39 −1
Original line number Diff line number Diff line
@@ -28,8 +28,10 @@ import com.android.keyguard.FaceWakeUpTriggersConfig 
import com.android.keyguard.KeyguardSecurityModel

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.systemui.SysuiTestCase

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

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

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

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

import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository

import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor
@@ -156,7 +158,6 @@ class KeyguardFaceAuthInteractorTest : SysuiTestCase() { 
                fakeDeviceEntryFingerprintAuthRepository,

                fakeUserRepository,

                facePropertyRepository,

                fakeKeyguardRepository,

                faceWakeUpTriggersConfig,

                powerInteractor,

            )
@@ -439,6 +440,43 @@ class KeyguardFaceAuthInteractorTest : SysuiTestCase() { 
                .isEqualTo(Pair(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_SWIPE_UP_ON_BOUNCER, false))

        }



    @Test

    fun faceAuthIsRequestedWhenWalletIsLaunchedAndIfFaceAuthIsStrong() =

        testScope.runTest {

            underTest.start()

            facePropertyRepository.setSensorInfo(FaceSensorInfo(1, SensorStrength.STRONG))



            underTest.onWalletLaunched()



            runCurrent()

            assertThat(faceAuthRepository.runningAuthRequest.value)

                .isEqualTo(Pair(FaceAuthUiEvent.FACE_AUTH_TRIGGERED_OCCLUDING_APP_REQUESTED, true))

        }



    @Test

    fun faceAuthIsNotTriggeredIfFaceAuthIsWeak() =

        testScope.runTest {

            underTest.start()

            facePropertyRepository.setSensorInfo(FaceSensorInfo(1, SensorStrength.WEAK))



            underTest.onWalletLaunched()



            runCurrent()

            assertThat(faceAuthRepository.runningAuthRequest.value).isNull()

        }



    @Test

    fun faceAuthIsNotTriggeredIfFaceAuthIsConvenience() =

        testScope.runTest {

            underTest.start()

            facePropertyRepository.setSensorInfo(FaceSensorInfo(1, SensorStrength.CONVENIENCE))



            underTest.onWalletLaunched()



            runCurrent()

            assertThat(faceAuthRepository.runningAuthRequest.value).isNull()

        }



    @Test

    fun faceUnlockIsDisabledWhenFpIsLockedOut() =

        testScope.runTest {