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

Commit 375bb648 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Move FaceAuth components to the deviceentry package 

* Renames KeyguardFaceAuthInteractor => DeviceEntryFaceAuthInteractor
* Updates the package to deviceentry
* Remove the previous interactor that was called DeviceEntryFaceAuthInteractor
* Update test utils

Test: builds
Bug: 287599719
Flag: None
Change-Id: I6b47d56e91ffa446723f3402135dfe3cd9909e04
parent af3dba48

core/java/android/hardware/face/FaceAuthenticateOptions.java

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ public class FaceAuthenticateOptions implements AuthenticateOptions, Parcelable 
     * The reason for this operation when requested by the system (sysui),

     * otherwise AUTHENTICATE_REASON_UNKNOWN.

     *

     * See frameworks/base/packages/SystemUI/src/com/android/keyguard/FaceAuthReason.kt

     * See packages/SystemUI/src/com/android/systemui/deviceentry/shared/FaceAuthReason.kt

     * for more details about each reason.

     */

    @DataClass.Generated.Member
@@ -524,7 +524,7 @@ public class FaceAuthenticateOptions implements AuthenticateOptions, Parcelable 
         * The reason for this operation when requested by the system (sysui),

         * otherwise AUTHENTICATE_REASON_UNKNOWN.

         *

         * See frameworks/base/packages/SystemUI/src/com/android/keyguard/FaceAuthReason.kt

         * See packages/SystemUI/src/com/android/systemui/deviceentry/shared/FaceAuthReason.kt

         * for more details about each reason.

         */

        @DataClass.Generated.Member

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor 
import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants

import com.android.systemui.classifier.FalsingA11yDelegate

import com.android.systemui.classifier.FalsingCollector

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor

import com.android.systemui.flags.FakeFeatureFlags

import com.android.systemui.flags.Flags

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

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractorFactory

import com.android.systemui.log.SessionTracker
@@ -140,7 +140,7 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
    @Mock private lateinit var viewMediatorCallback: ViewMediatorCallback

    @Mock private lateinit var audioManager: AudioManager

    @Mock private lateinit var mSelectedUserInteractor: SelectedUserInteractor

    @Mock private lateinit var faceAuthInteractor: KeyguardFaceAuthInteractor

    @Mock private lateinit var faceAuthInteractor: DeviceEntryFaceAuthInteractor

    @Mock private lateinit var faceAuthAccessibilityDelegate: FaceAuthAccessibilityDelegate

    @Mock private lateinit var deviceProvisionedController: DeviceProvisionedController

    @Mock private lateinit var postureController: DevicePostureController

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -85,10 +85,10 @@ import com.android.systemui.biometrics.ui.viewmodel.DefaultUdfpsTouchOverlayView 
import com.android.systemui.biometrics.ui.viewmodel.DeviceEntryUdfpsTouchOverlayViewModel;

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

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

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.keyguard.ScreenLifecycle;

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

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

import com.android.systemui.log.SessionTracker;

import com.android.systemui.plugins.FalsingManager;
@@ -336,7 +336,7 @@ public class UdfpsControllerTest extends SysuiTestCase { 
                mSessionTracker,

                mAlternateBouncerInteractor,

                mInputManager,

                mock(KeyguardFaceAuthInteractor.class),

                mock(DeviceEntryFaceAuthInteractor.class),

                mUdfpsKeyguardAccessibilityDelegate,

                mSelectedUserInteractor,

                mFpsUnlockTracker,

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerWithCoroutinesTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor 
import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants

import com.android.systemui.bouncer.ui.BouncerView

import com.android.systemui.classifier.FalsingCollector

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor

import com.android.systemui.keyguard.DismissCallbackRegistry

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

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

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

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

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractorFactory

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

import com.android.systemui.keyguard.shared.model.TransitionState
@@ -111,7 +111,7 @@ class UdfpsKeyguardViewLegacyControllerWithCoroutinesTest : 
                FakeTrustRepository(),

                testScope.backgroundScope,

                mSelectedUserInteractor,

                mock(KeyguardFaceAuthInteractor::class.java),

                mock(DeviceEntryFaceAuthInteractor::class.java),

            )

        mAlternateBouncerInteractor =

            AlternateBouncerInteractor(

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

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.systemui.authentication.shared.model.AuthenticationMethodMode 
import com.android.systemui.authentication.shared.model.AuthenticationPatternCoordinate

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

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

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor

import com.android.systemui.res.R

import com.android.systemui.scene.SceneTestUtils

import com.google.common.truth.Truth.assertThat
@@ -46,7 +46,7 @@ import org.mockito.MockitoAnnotations 
@RunWith(AndroidJUnit4::class)

class BouncerInteractorTest : SysuiTestCase() {



    @Mock private lateinit var keyguardFaceAuthInteractor: KeyguardFaceAuthInteractor

    @Mock private lateinit var mDeviceEntryFaceAuthInteractor: DeviceEntryFaceAuthInteractor



    private val utils = SceneTestUtils(this)

    private val testScope = utils.testScope
@@ -67,7 +67,7 @@ class BouncerInteractorTest : SysuiTestCase() { 
        underTest =

            utils.bouncerInteractor(

                authenticationInteractor = authenticationInteractor,

                keyguardFaceAuthInteractor = keyguardFaceAuthInteractor,

                deviceEntryFaceAuthInteractor = mDeviceEntryFaceAuthInteractor,

            )

    }
@@ -306,7 +306,7 @@ class BouncerInteractorTest : SysuiTestCase() { 
    fun intentionalUserInputEvent_notifiesFaceAuthInteractor() =

        testScope.runTest {

            underTest.onIntentionalUserInput()

            verify(keyguardFaceAuthInteractor).onPrimaryBouncerUserInput()

            verify(mDeviceEntryFaceAuthInteractor).onPrimaryBouncerUserInput()

        }



    companion object {