Merge "Clear references to animation runner when the animation ends." into pi-dev

This commit is contained in:
android-build-team Robot
2018-05-07 19:34:59 +00:00
committed by Android (Google) Code Review

View File

@@ -79,7 +79,7 @@ public class RecentsAnimationController implements DeathRecipient {
public @interface ReorderMode {} public @interface ReorderMode {}
private final WindowManagerService mService; private final WindowManagerService mService;
private final IRecentsAnimationRunner mRunner; private IRecentsAnimationRunner mRunner;
private final RecentsAnimationCallbacks mCallbacks; private final RecentsAnimationCallbacks mCallbacks;
private final ArrayList<TaskAnimationAdapter> mPendingAnimations = new ArrayList<>(); private final ArrayList<TaskAnimationAdapter> mPendingAnimations = new ArrayList<>();
private final int mDisplayId; private final int mDisplayId;
@@ -426,7 +426,10 @@ public class RecentsAnimationController implements DeathRecipient {
removeAnimation(taskAdapter); removeAnimation(taskAdapter);
} }
// Clear references to the runner
unlinkToDeathOfRunner(); unlinkToDeathOfRunner();
mRunner = null;
// Clear associated input consumers // Clear associated input consumers
mService.mInputMonitor.updateInputWindowsLw(true /*force*/); mService.mInputMonitor.updateInputWindowsLw(true /*force*/);
mService.destroyInputConsumer(INPUT_CONSUMER_RECENTS_ANIMATION); mService.destroyInputConsumer(INPUT_CONSUMER_RECENTS_ANIMATION);