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

Commit 72a21cf3 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Don't schedule SurfaceControl transaction if it is not valid" into tm-qpr-dev am: 34ffe6d5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19338489



Change-Id: I2c2a258f6a3cbc1ba2e10e6f4f6e48a8ee2e0b5e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b46382a 34ffe6d5

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt

+8 −6
Original line number Diff line number Diff line
@@ -523,9 +523,10 @@ class ActivityLaunchAnimator( 
            state: LaunchAnimator.State,

            linearProgress: Float,

        ) {

            if (transactionApplierView.viewRootImpl == null) {

                // If the view root we synchronize with was detached, don't apply any transaction

                // (as [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw).

            if (transactionApplierView.viewRootImpl == null || !window.leash.isValid) {

                // Don't apply any transaction if the view root we synchronize with was detached or

                // if the SurfaceControl associated with [window] is not valid, as

                // [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw.

                return

            }
@@ -605,9 +606,10 @@ class ActivityLaunchAnimator( 
            state: LaunchAnimator.State,

            linearProgress: Float

        ) {

            if (transactionApplierView.viewRootImpl == null) {

                // If the view root we synchronize with was detached, don't apply any transaction

                // (as [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw).

            if (transactionApplierView.viewRootImpl == null || !navigationBar.leash.isValid) {

                // Don't apply any transaction if the view root we synchronize with was detached or

                // if the SurfaceControl associated with [navigationBar] is not valid, as

                // [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw.

                return

            }