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

Merge "Block animation transfer after surface animation finishes." am: 4e54b2f3f9 am: 8057c823bf

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

Change-Id: I5af2fa814deca6d6e454fb75aa9c69e38988e854
This commit is contained in:
Chris Li
2022-01-27 03:51:05 +00:00
committed by Automerger Merge Worker
parent c15388da45 8057c823bf
commit b91693b117
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/SurfaceAnimator.java
View File

@@ -85,6 +85,8 @@ class SurfaceAnimator {
private boolean mAnimationStartDelayed; private boolean mAnimationStartDelayed;
private boolean mAnimationFinished;
/** /**
* @param animatable The object to animate. * @param animatable The object to animate.
* @param staticAnimationFinishedCallback Callback to invoke when an animation has finished * @param staticAnimationFinishedCallback Callback to invoke when an animation has finished
@@ -134,6 +136,7 @@ class SurfaceAnimator {
|| anim.shouldDeferAnimationFinish(resetAndInvokeFinish))) { || anim.shouldDeferAnimationFinish(resetAndInvokeFinish))) {
resetAndInvokeFinish.run(); resetAndInvokeFinish.run();
} }
mAnimationFinished = true;
} }
}; };
} }
@@ -289,6 +292,9 @@ class SurfaceAnimator {
Slog.w(TAG, "Unable to transfer animation, surface or parent is null"); Slog.w(TAG, "Unable to transfer animation, surface or parent is null");
cancelAnimation(); cancelAnimation();
return; return;
} else if (from.mAnimationFinished) {
Slog.w(TAG, "Unable to transfer animation, because " + from + " animation is finished");
return;
} }
endDelayingAnimationStart(); endDelayingAnimationStart();
final Transaction t = mAnimatable.getPendingTransaction(); final Transaction t = mAnimatable.getPendingTransaction();
@@ -367,6 +373,7 @@ class SurfaceAnimator {
SurfaceControl leash = mLeash; SurfaceControl leash = mLeash;
mLeash = null; mLeash = null;
final boolean scheduleAnim = removeLeash(t, mAnimatable, leash, destroyLeash); final boolean scheduleAnim = removeLeash(t, mAnimatable, leash, destroyLeash);
mAnimationFinished = false;
if (scheduleAnim) { if (scheduleAnim) {
mService.scheduleAnimationLocked(); mService.scheduleAnimationLocked();
} }