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

Commit 2aa04c03 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I80a85e7e,I74d30d83 into main 

* changes:
  Don't remove the UdfpsView if it hasn't been added yet.
  Use KeyguardTransitions instead of PowerInteractor's wakefulness state
parents e14582e0 966bad85

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

+110 −7
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.MotionEvent 
import android.view.Surface

import android.view.Surface.Rotation

import android.view.View

import android.view.ViewGroup

import android.view.WindowManager

import android.view.accessibility.AccessibilityManager

import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -46,7 +47,12 @@ import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor 
import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.classifier.FalsingCollector

import com.android.systemui.dump.DumpManager

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

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

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

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

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

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

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.power.data.repository.FakePowerRepository

import com.android.systemui.power.domain.interactor.PowerInteractor
@@ -127,7 +133,8 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
    @Mock private lateinit var defaultUdfpsTouchOverlayViewModel: DefaultUdfpsTouchOverlayViewModel

    @Mock

    private lateinit var udfpsKeyguardAccessibilityDelegate: UdfpsKeyguardAccessibilityDelegate

    @Mock private lateinit var keyguardTransitionInteractor: KeyguardTransitionInteractor

    private lateinit var keyguardTransitionRepository: FakeKeyguardTransitionRepository

    private lateinit var keyguardTransitionInteractor: KeyguardTransitionInteractor

    @Mock private lateinit var shadeInteractor: ShadeInteractor

    @Captor private lateinit var layoutParamsCaptor: ArgumentCaptor<WindowManager.LayoutParams>

    @Mock private lateinit var udfpsOverlayInteractor: UdfpsOverlayInteractor
@@ -150,6 +157,19 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
                mock(ScreenOffAnimationController::class.java),

                statusBarStateController,

            )

        keyguardTransitionRepository = FakeKeyguardTransitionRepository()

        keyguardTransitionInteractor =

            KeyguardTransitionInteractor(

                scope = testScope.backgroundScope,

                repository = keyguardTransitionRepository,

                fromLockscreenTransitionInteractor = {

                    mock(FromLockscreenTransitionInteractor::class.java)

                },

                fromPrimaryBouncerTransitionInteractor = {

                    mock(FromPrimaryBouncerTransitionInteractor::class.java)

                },

                fromAodTransitionInteractor = { mock(FromAodTransitionInteractor::class.java) },

            )

        whenever(inflater.inflate(R.layout.udfps_view, null, false)).thenReturn(udfpsView)

        whenever(inflater.inflate(R.layout.udfps_bp_view, null))

            .thenReturn(mock(UdfpsBpView::class.java))
@@ -159,11 +179,25 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
            .thenReturn(mock(UdfpsFpmEmptyView::class.java))

    }



    private suspend fun withReasonSuspend(

        @RequestReason reason: Int,

        isDebuggable: Boolean = false,

        enableDeviceEntryUdfpsRefactor: Boolean = false,

        block: suspend () -> Unit,

    ) {

        withReason(

            reason,

            isDebuggable,

            enableDeviceEntryUdfpsRefactor,

        )

        block()

    }



    private fun withReason(

        @RequestReason reason: Int,

        isDebuggable: Boolean = false,

        enableDeviceEntryUdfpsRefactor: Boolean = false,

        block: () -> Unit,

        block: () -> Unit = {},

    ) {

        if (enableDeviceEntryUdfpsRefactor) {

            mSetFlagsRule.enableFlags(Flags.FLAG_DEVICE_ENTRY_UDFPS_REFACTOR)
@@ -312,6 +346,7 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
                    lastWakeReason = WakeSleepReason.POWER_BUTTON,

                    lastSleepReason = WakeSleepReason.OTHER,

                )

                runCurrent()

                controllerOverlay.show(udfpsController, overlayParams)

                runCurrent()

                verify(windowManager).addView(any(), any())
@@ -321,15 +356,25 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
    @Test

    fun showUdfpsOverlay_whileGoingToSleep() =

        testScope.runTest {

            withReason(REASON_AUTH_KEYGUARD) {

            withReasonSuspend(REASON_AUTH_KEYGUARD) {

                mSetFlagsRule.enableFlags(Flags.FLAG_UDFPS_VIEW_PERFORMANCE)

                keyguardTransitionRepository.sendTransitionSteps(

                    from = KeyguardState.OFF,

                    to = KeyguardState.GONE,

                    testScope = this,

                )

                powerRepository.updateWakefulness(

                    rawState = WakefulnessState.STARTING_TO_SLEEP,

                    lastWakeReason = WakeSleepReason.POWER_BUTTON,

                    lastSleepReason = WakeSleepReason.OTHER,

                )

                runCurrent()



                // WHEN a request comes to show the view

                controllerOverlay.show(udfpsController, overlayParams)

                runCurrent()



                // THEN the view does not get added immediately

                verify(windowManager, never()).addView(any(), any())



                // we hide to end the job that listens for the finishedGoingToSleep signal
@@ -338,25 +383,82 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
        }



    @Test

    fun showUdfpsOverlay_afterFinishedGoingToSleep() =

    fun showUdfpsOverlay_whileAsleep() =

        testScope.runTest {

            withReason(REASON_AUTH_KEYGUARD) {

            withReasonSuspend(REASON_AUTH_KEYGUARD) {

                mSetFlagsRule.enableFlags(Flags.FLAG_UDFPS_VIEW_PERFORMANCE)

                keyguardTransitionRepository.sendTransitionSteps(

                    from = KeyguardState.OFF,

                    to = KeyguardState.GONE,

                    testScope = this,

                )

                powerRepository.updateWakefulness(

                    rawState = WakefulnessState.STARTING_TO_SLEEP,

                    rawState = WakefulnessState.ASLEEP,

                    lastWakeReason = WakeSleepReason.POWER_BUTTON,

                    lastSleepReason = WakeSleepReason.OTHER,

                )

                runCurrent()



                // WHEN a request comes to show the view

                controllerOverlay.show(udfpsController, overlayParams)

                runCurrent()



                // THEN view isn't added yet

                verify(windowManager, never()).addView(any(), any())



                // we hide to end the job that listens for the finishedGoingToSleep signal

                controllerOverlay.hide()

            }

        }



    @Test

    fun neverRemoveViewThatHasNotBeenAdded() =

        testScope.runTest {

            withReasonSuspend(REASON_AUTH_KEYGUARD) {

                mSetFlagsRule.enableFlags(Flags.FLAG_UDFPS_VIEW_PERFORMANCE)

                controllerOverlay.show(udfpsController, overlayParams)

                val view = controllerOverlay.getTouchOverlay()

                view?.let {

                    // parent is null, signalling that the view was never added

                    whenever(view.parent).thenReturn(null)

                }

                verify(windowManager, never()).removeView(eq(view))

            }

        }



    @Test

    fun showUdfpsOverlay_afterFinishedTransitioningToAOD() =

        testScope.runTest {

            withReasonSuspend(REASON_AUTH_KEYGUARD) {

                mSetFlagsRule.enableFlags(Flags.FLAG_UDFPS_VIEW_PERFORMANCE)

                keyguardTransitionRepository.sendTransitionSteps(

                    from = KeyguardState.OFF,

                    to = KeyguardState.GONE,

                    testScope = this,

                )

                powerRepository.updateWakefulness(

                    rawState = WakefulnessState.ASLEEP,

                    rawState = WakefulnessState.STARTING_TO_SLEEP,

                    lastWakeReason = WakeSleepReason.POWER_BUTTON,

                    lastSleepReason = WakeSleepReason.OTHER,

                )

                runCurrent()



                // WHEN a request comes to show the view

                controllerOverlay.show(udfpsController, overlayParams)

                runCurrent()



                // THEN the view does not get added immediately

                verify(windowManager, never()).addView(any(), any())



                // WHEN the device finishes transitioning to AOD

                keyguardTransitionRepository.sendTransitionSteps(

                    from = KeyguardState.GONE,

                    to = KeyguardState.AOD,

                    testScope = this,

                )

                runCurrent()



                // THEN the view gets added

                verify(windowManager)

                    .addView(eq(controllerOverlay.getTouchOverlay()), layoutParamsCaptor.capture())

            }
@@ -387,6 +489,7 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
    private fun hideUdfpsOverlay() {

        val didShow = controllerOverlay.show(udfpsController, overlayParams)

        val view = controllerOverlay.getTouchOverlay()

        view?.let { whenever(view.parent).thenReturn(mock(ViewGroup::class.java)) }

        val didHide = controllerOverlay.hide()



        verify(windowManager).removeView(eq(view))

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

+7 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.view.LayoutInflater; 
import android.view.MotionEvent;

import android.view.Surface;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewRootImpl;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityManager;
@@ -234,6 +235,8 @@ public class UdfpsControllerTest extends SysuiTestCase { 
    private ArgumentCaptor<IUdfpsOverlayController> mOverlayCaptor;

    private IUdfpsOverlayController mOverlayController;

    @Captor

    private ArgumentCaptor<View> mViewCaptor;

    @Captor

    private ArgumentCaptor<UdfpsView.OnTouchListener> mTouchListenerCaptor;

    @Captor

    private ArgumentCaptor<View.OnHoverListener> mHoverListenerCaptor;
@@ -550,8 +553,11 @@ public class UdfpsControllerTest extends SysuiTestCase { 
                                    mOpticalProps.sensorId,

                                    BiometricRequestConstants.REASON_ENROLL_ENROLLING,

                                    mUdfpsOverlayControllerCallback);



                            mFgExecutor.runAllReady();

                            verify(mWindowManager).addView(any(), any());

                            verify(mWindowManager).addView(mViewCaptor.capture(), any());

                            when(mViewCaptor.getValue().getParent())

                                    .thenReturn(mock(ViewGroup.class));



                            // Update overlay parameters.

                            reset(mWindowManager);

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt

+26 −13
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.hardware.biometrics.BiometricRequestConstants.RequestReason 
import android.hardware.fingerprint.IUdfpsOverlayControllerCallback

import android.os.Build

import android.os.RemoteException

import android.os.Trace

import android.provider.Settings

import android.util.Log

import android.util.RotationUtils
@@ -58,9 +59,9 @@ import com.android.systemui.dagger.qualifiers.Application 
import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor

import com.android.systemui.dump.DumpManager

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

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

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.power.shared.model.WakefulnessState

import com.android.systemui.res.R

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.LockscreenShadeTransitionController
@@ -125,11 +126,15 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
        private val powerInteractor: PowerInteractor,

        @Application private val scope: CoroutineScope,

) {

    private val isFinishedGoingToSleep: Flow<Unit> =

        powerInteractor.detailedWakefulness

            .filter { it.internalWakefulnessState == WakefulnessState.ASLEEP }

    private val currentStateUpdatedToOffAodOrDozing: Flow<Unit> =

        transitionInteractor.currentKeyguardState

            .filter {

                it == KeyguardState.OFF ||

                    it == KeyguardState.AOD ||

                    it == KeyguardState.DOZING

            }

            .map { } // map to Unit

    private var listenForAsleepJob: Job? = null

    private var listenForCurrentKeyguardState: Job? = null

    private var addViewRunnable: Runnable? = null

    private var overlayViewLegacy: UdfpsView? = null

        private set
@@ -280,18 +285,19 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
    private fun addViewNowOrLater(view: View, animation: UdfpsAnimationViewController<*>?) {

        if (udfpsViewPerformance()) {

            addViewRunnable = kotlinx.coroutines.Runnable {

                Trace.setCounter("UdfpsAddView", 1)

                windowManager.addView(

                        view,

                        coreLayoutParams.updateDimensions(animation)

                )

            }

            if (powerInteractor.detailedWakefulness.value.internalWakefulnessState

                    != WakefulnessState.STARTING_TO_SLEEP) {

            if (powerInteractor.detailedWakefulness.value.isAwake()) {

                // Device is awake, so we add the view immediately.

                addViewIfPending()

            } else {

                listenForAsleepJob?.cancel()

                listenForAsleepJob = scope.launch {

                    isFinishedGoingToSleep.collect {

                listenForCurrentKeyguardState?.cancel()

                listenForCurrentKeyguardState = scope.launch {

                    currentStateUpdatedToOffAodOrDozing.collect {

                        addViewIfPending()

                    }

                }
@@ -306,7 +312,7 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 


    private fun addViewIfPending() {

        addViewRunnable?.let {

            listenForAsleepJob?.cancel()

            listenForCurrentKeyguardState?.cancel()

            it.run()

        }

        addViewRunnable = null
@@ -412,7 +418,14 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
            udfpsDisplayModeProvider.disable(null)

        }

        getTouchOverlay()?.apply {

            if (udfpsViewPerformance()) {

                if (this.parent != null) {

                    windowManager.removeView(this)

                }

                Trace.setCounter("UdfpsAddView", 0)

            } else {

                windowManager.removeView(this)

            }

            setOnTouchListener(null)

            setOnHoverListener(null)

            overlayTouchListener?.let {
@@ -423,7 +436,7 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
        overlayViewLegacy = null

        overlayTouchView = null

        overlayTouchListener = null

        listenForAsleepJob?.cancel()

        listenForCurrentKeyguardState?.cancel()



        return wasShowing

    }