Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d1ee4c4 authored by Arthur Hung's avatar Arthur Hung Committed by Android (Google) Code Review
Browse files

Merge "Fix InputConsumer for RecentsAnimationController may access null pointer"

parents 5ead0d99 1b636fa6

services/core/java/com/android/server/wm/RecentsAnimationController.java

+6 −4
Original line number Diff line number Diff line
@@ -504,11 +504,13 @@ public class RecentsAnimationController implements DeathRecipient { 
    public void binderDied() {

        cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "binderDied");



        synchronized (mService.getWindowManagerLock()) {

            // Clear associated input consumers on runner death

            final InputMonitor inputMonitor =

                    mService.mRoot.getDisplayContent(mDisplayId).getInputMonitor();

            inputMonitor.destroyInputConsumer(INPUT_CONSUMER_RECENTS_ANIMATION);

        }

    }



    void checkAnimationReady(WallpaperController wallpaperController) {

        if (mPendingStart) {