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-d1-dev

Browse Source
This commit is contained in:
Jordan Demeulenaere
2022-07-25 15:04:00 +00:00
committed by Android (Google) Code Review
parent b4ca20115d 5b9c3bf25e
commit e0c7fee38b
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

@@ -494,9 +494,10 @@ class ActivityLaunchAnimator(
} }
private fun applyStateToWindow(window: RemoteAnimationTarget, state: LaunchAnimator.State) { private fun applyStateToWindow(window: RemoteAnimationTarget, state: LaunchAnimator.State) {
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
} }
@@ -557,9 +558,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
} }