commit 17588181b9b892eac60545fd625759a989352deb
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon May 07 17:26:52 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon May 07 17:26:52 2018 +0000
tree ef80305dd4da0a0f04ba43241dae378fb00a2391
parent 537c0f6dd6b3912ca384af0dfa3bba677127b07f
parent 76a2a6ae661813b33cce25fc0e129b8f0d03348a

[automerger] Clear refs to the controller and saved snapshot upon finishing animation am: 76a2a6ae66

Change-Id: I9011a8271f73d68de8ff018e371d9ca2e45ff938

quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
index 4ba9e02..730984c 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
@@ -58,6 +58,7 @@
                     if (onFinishComplete != null) {
                         onFinishComplete.run();
                     }
+                    controller = null;
                 }
             }
         });

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 9dae9df..614ba6e 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -677,6 +677,7 @@
 
         mActivityInitListener.unregister();
         mInputConsumer.unregisterInputConsumer();
+        mTaskSnapshot = null;
     }
 
     private void invalidateHandlerWithLauncher() {