commit 42be8fa0dbc8d3c1a78fcbcb08485b3416d9d159
author Schneider Victor-tulias <victortulias@google.com> Mon May 09 16:23:30 2022 -0700
committer Schneider Victor-tulias <victortulias@google.com> Fri May 13 11:14:19 2022 -0700
tree fa08b8aa5ad1ca23e586395c134e5bcfeeb5cd9e
parent 69230bbb29b44be90f2b3151d5b472c86ff75cc0

Clear recents animation controllers and recents animation snapshots synchronously.

Clearing the recents animation controller synchronously immediately after posting a screenshot cleanup was making it almost impossible to cleanup the screenshot when cancelling the recents animation. Moved  the recents animation controller clearing to run synchronously with cleaning up the screenshot.

Bug: 223498680
Test: manually with 3 button mode.
Change-Id: I6af5bd4525976eb6956d0466dceae1787b3b84d8

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index f60b225..1b1cb85 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -151,6 +151,7 @@
 
     // Null if the recents animation hasn't started yet or has been canceled or finished.
     protected @Nullable RecentsAnimationController mRecentsAnimationController;
+    protected @Nullable RecentsAnimationController mDeferredCleanupRecentsAnimationController;
     protected RecentsAnimationTargets mRecentsAnimationTargets;
     protected T mActivity;
     protected Q mRecentsView;
@@ -435,6 +436,9 @@
                     mRecentsView.switchToScreenshot(snapshots, () -> {
                         if (mRecentsAnimationController != null) {
                             mRecentsAnimationController.cleanupScreenshot();
+                        } else if (mDeferredCleanupRecentsAnimationController != null) {
+                            mDeferredCleanupRecentsAnimationController.cleanupScreenshot();
+                            mDeferredCleanupRecentsAnimationController = null;
                         }
                     });
                     mRecentsView.onRecentsAnimationComplete();
@@ -839,6 +843,9 @@
     public void onRecentsAnimationCanceled(HashMap<Integer, ThumbnailData> thumbnailDatas) {
         ActiveGestureLog.INSTANCE.addLog("cancelRecentsAnimation");
         mActivityInitListener.unregister();
+        // Cache the recents animation controller so we can defer its cleanup to after having
+        // properly cleaned up the screenshot without accidentally using it.
+        mDeferredCleanupRecentsAnimationController = mRecentsAnimationController;
         mStateCallback.setStateOnUiThread(STATE_GESTURE_CANCELLED | STATE_HANDLER_INVALIDATED);
 
         if (mRecentsAnimationTargets != null) {