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

Merge "[Bugfix][RemoteAnimation] Fix IndexOutOfBoundsException in onAnimationFinished of RemoteAnimationController" am: 4b7206b8d8 am: b7e86b3e01 am: 8d5e476385 am: 0bb4677873

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

Change-Id: Ifae7b9e5d21925fe0c28acaeb24e4f6583d9adf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2022-07-11 08:35:35 +00:00
committed by Automerger Merge Worker
parent bef1e16c59 0bb4677873
commit a32d2dc9dd
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/RemoteAnimationController.java
View File

@@ -71,6 +71,7 @@ class RemoteAnimationController implements DeathRecipient {
final ArrayList<NonAppWindowAnimationAdapter> mPendingNonAppAnimations = new ArrayList<>(); final ArrayList<NonAppWindowAnimationAdapter> mPendingNonAppAnimations = new ArrayList<>();
private final Handler mHandler; private final Handler mHandler;
private final Runnable mTimeoutRunnable = () -> cancelAnimation("timeoutRunnable"); private final Runnable mTimeoutRunnable = () -> cancelAnimation("timeoutRunnable");
private boolean mIsFinishing;
private FinishedCallback mFinishedCallback; private FinishedCallback mFinishedCallback;
private final boolean mIsActivityEmbedding; private final boolean mIsActivityEmbedding;
@@ -275,6 +276,7 @@ class RemoteAnimationController implements DeathRecipient {
mPendingAnimations.size()); mPendingAnimations.size());
mHandler.removeCallbacks(mTimeoutRunnable); mHandler.removeCallbacks(mTimeoutRunnable);
synchronized (mService.mGlobalLock) { synchronized (mService.mGlobalLock) {
mIsFinishing = true;
unlinkToDeathOfRunner(); unlinkToDeathOfRunner();
releaseFinishedCallback(); releaseFinishedCallback();
mService.openSurfaceTransaction(); mService.openSurfaceTransaction();
@@ -319,6 +321,7 @@ class RemoteAnimationController implements DeathRecipient {
throw e; throw e;
} finally { } finally {
mService.closeSurfaceTransaction("RemoteAnimationController#finished"); mService.closeSurfaceTransaction("RemoteAnimationController#finished");
mIsFinishing = false;
} }
} }
// Reset input for all activities when the remote animation is finished. // Reset input for all activities when the remote animation is finished.
@@ -558,6 +561,9 @@ class RemoteAnimationController implements DeathRecipient {
@Override @Override
public void onAnimationCancelled(SurfaceControl animationLeash) { public void onAnimationCancelled(SurfaceControl animationLeash) {
if (mIsFinishing) {
return;
}
if (mRecord.mAdapter == this) { if (mRecord.mAdapter == this) {
mRecord.mAdapter = null; mRecord.mAdapter = null;
} else { } else {