Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jordan Demeulenaere
2022-07-20 09:26:56 +00:00
committed by Android (Google) Code Review
parent edc5347ff7 639ce39189
commit 34ffe6d58b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt
View File

@@ -523,9 +523,10 @@ class ActivityLaunchAnimator(
state: LaunchAnimator.State, state: LaunchAnimator.State,
linearProgress: Float, linearProgress: Float,
) { ) {
if (transactionApplierView.viewRootImpl == null) { if (transactionApplierView.viewRootImpl == null || !window.leash.isValid) {
// If the view root we synchronize with was detached, don't apply any transaction // Don't apply any transaction if the view root we synchronize with was detached or
// (as [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw). // if the SurfaceControl associated with [window] is not valid, as
// [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw.
return return
} }
@@ -605,9 +606,10 @@ class ActivityLaunchAnimator(
state: LaunchAnimator.State, state: LaunchAnimator.State,
linearProgress: Float linearProgress: Float
) { ) {
if (transactionApplierView.viewRootImpl == null) { if (transactionApplierView.viewRootImpl == null || !navigationBar.leash.isValid) {
// If the view root we synchronize with was detached, don't apply any transaction // Don't apply any transaction if the view root we synchronize with was detached or
// (as [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw). // if the SurfaceControl associated with [navigationBar] is not valid, as
// [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw.
return return
} }