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

Commit 9fac59ab authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Only update udfps view params if addViewRunnable IS null" into main

parents 18eb0668 e9c77b8a

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

+2 −2
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
                // THEN the view layout is never updated

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



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

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

                controllerOverlay.hide()

            }

        }
@@ -595,7 +595,7 @@ class UdfpsControllerOverlayTest : SysuiTestCase() { 
                controllerOverlay.updateOverlayParams(overlayParams)



                // THEN the view layout is updated

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

                verify(windowManager).updateViewLayout(any(), any())

            }

        }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
        overlayParams = updatedOverlayParams

        sensorBounds = updatedOverlayParams.sensorBounds

        getTouchOverlay()?.let {

            if (addViewRunnable != null) {

            if (addViewRunnable == null) {

                // Only updateViewLayout if there's no pending view to add to WM.

                // If there is a pending view, that means the view hasn't been added yet so there's

                // no need to update any layouts. Instead the correct params will be used when the