Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b87834873f

Change-Id: I8a1d90b75128884ebcbcb081e64460edc1794301
This commit is contained in:
android-build-team Robot
2018-05-07 12:48:43 -07:00
committed by android-build-merger
parent 63d0f71df0 b87834873f
commit 7a2280451d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/RecentsAnimationController.java
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);