Merge "Clear references to animation runner when the animation ends." into pi-dev
am: b87834873f
Change-Id: I8a1d90b75128884ebcbcb081e64460edc1794301
diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java
index 85e4ac7..553b4fe 100644
--- a/services/core/java/com/android/server/wm/RecentsAnimationController.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java
@@ -79,7 +79,7 @@
public @interface ReorderMode {}
private final WindowManagerService mService;
- private final IRecentsAnimationRunner mRunner;
+ private IRecentsAnimationRunner mRunner;
private final RecentsAnimationCallbacks mCallbacks;
private final ArrayList<TaskAnimationAdapter> mPendingAnimations = new ArrayList<>();
private final int mDisplayId;
@@ -426,7 +426,10 @@
removeAnimation(taskAdapter);
}
+ // Clear references to the runner
unlinkToDeathOfRunner();
+ mRunner = null;
+
// Clear associated input consumers
mService.mInputMonitor.updateInputWindowsLw(true /*force*/);
mService.destroyInputConsumer(INPUT_CONSUMER_RECENTS_ANIMATION);