Merge "Postpone destroying leash until after cancel callback."

2019-02-12 03:34:25 +00:00
parent 88f53c2378 4a2d374135
commit e1f2384819
1 changed files with 7 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/SurfaceAnimator.java
+++ b/services/core/java/com/android/server/wm/SurfaceAnimator.java
@@ -251,7 +251,7 @@ class SurfaceAnimator {
        if (DEBUG_ANIM) Slog.i(TAG, "Cancelling animation restarting=" + restarting);
        final SurfaceControl leash = mLeash;
        final AnimationAdapter animation = mAnimation;
-        reset(t, forwardCancel);
+        reset(t, false);
        if (animation != null) {
            if (!mAnimationStartDelayed && forwardCancel) {
                animation.onAnimationCancelled(leash);
@@ -260,6 +260,12 @@ class SurfaceAnimator {
                mAnimationFinishedCallback.run();
            }
        }
+
+        if (forwardCancel && leash != null) {
+            t.remove(leash);
+            mService.scheduleAnimationLocked();
+        }
+
        if (!restarting) {
            mAnimationStartDelayed = false;
        }