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

Commit 7a0a7c53 authored by Chandru S's avatar Chandru S
Browse files

Stop using cameraProtectionAnimator field 

Previously, we were canceling cameraProtectionAnimator and rimAnimator separately when the latter was an AnimatorSet that includes cameraProtectionAnimator as well. The hypothesis is that cameraProtectionAnimator becomes null because we run `rimAnimator?.cancel() -> cameraProtectionAnimator#onAnimationEnd` and then we create a new rim animator with the null cameraProtectionAnimator

Bug: 392032258
Flag: com.android.systemui.face_scanning_animation_npe_fix
Test: verified scanning animation works as expected
Change-Id: I48199e7caedbdb13cf23c877e3c71eb1c191686e
parent 966b854d

packages/SystemUI/src/com/android/systemui/FaceScanningOverlay.kt

+15 −4
Original line number Diff line number Diff line
@@ -109,11 +109,20 @@ class FaceScanningOverlay( 
            requestLayout()

        }



        if (!Flags.faceScanningAnimationNpeFix()) {

            cameraProtectionAnimator?.cancel()

            cameraProtectionAnimator = cameraProtectionAnimator(faceAuthSucceeded)

        }



        rimAnimator?.cancel()

        rimAnimator = faceScanningRimAnimator(faceAuthSucceeded, cameraProtectionAnimator)

        rimAnimator = faceScanningRimAnimator(

            faceAuthSucceeded,

            if (Flags.faceScanningAnimationNpeFix()) {

                cameraProtectionAnimator(faceAuthSucceeded)

            } else {

                cameraProtectionAnimator

            },

        )

        rimAnimator?.start()

    }
@@ -160,7 +169,9 @@ class FaceScanningOverlay( 
            addUpdateListener(this@FaceScanningOverlay::updateCameraProtectionProgress)

            addListener(object : AnimatorListenerAdapter() {

                override fun onAnimationEnd(animation: Animator) {

                    if (!Flags.faceScanningAnimationNpeFix()) {

                        cameraProtectionAnimator = null

                    }

                    if (!showScanningAnim) {

                        hide()

                    }