From 76a2a6ae661813b33cce25fc0e129b8f0d03348a Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 7 May 2018 10:15:32 -0700
Subject: [PATCH] Clear refs to the controller and saved snapshot upon
 finishing animation

Bug: 79322746
Change-Id: I8786909615da3368a22300d5e33cefa4b77623fd
---
 quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java | 1 +
 .../src/com/android/quickstep/WindowTransformSwipeHandler.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
index 4ba9e02b18..730984c934 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
@@ -58,6 +58,7 @@ public class RecentsAnimationWrapper {
                     if (onFinishComplete != null) {
                         onFinishComplete.run();
                     }
+                    controller = null;
                 }
             }
         });
diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 9dae9dfe0b..614ba6e685 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -677,6 +677,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
 
         mActivityInitListener.unregister();
         mInputConsumer.unregisterInputConsumer();
+        mTaskSnapshot = null;
     }
 
     private void invalidateHandlerWithLauncher() {