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

Don't schedule SurfaceControl transaction if it is not valid

Browse Source 
This CL adds a preventive check to ensure that we don't schedule a
transaction on a SurfaceControl that was released.

Bug: 237183762
Test: Manual
Change-Id: I86f8372c7de8234f5f1dd941dbf1c9eb9fbef647
Merged-In: I86f8372c7de8234f5f1dd941dbf1c9eb9fbef647
This commit is contained in:
Jordan Demeulenaere
2022-07-19 16:47:14 +02:00
parent 904e5190a7
commit 5b9c3bf25e
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) {
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
}
@@ -557,9 +558,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
}