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 am: 34ffe6d58b

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

Change-Id: I2c2a258f6a3cbc1ba2e10e6f4f6e48a8ee2e0b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jordan Demeulenaere
2022-07-20 09:31:51 +00:00
committed by Automerger Merge Worker
parent 1b46382ac5 34ffe6d58b
commit 72a21cf33a
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
} }