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

Commit 61c04730 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "When detaching player, set to null before clean-up" into udc-dev

parents 00821628 a0f25d58

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

+2 −1
Original line number Diff line number Diff line
@@ -192,6 +192,8 @@ class TransitionController { 


    private void detachPlayer() {

        if (mTransitionPlayer == null) return;

        // Immediately set to null so that nothing inadvertently starts/queues.

        mTransitionPlayer = null;

        // Clean-up/finish any playing transitions.

        for (int i = 0; i < mPlayingTransitions.size(); ++i) {

            mPlayingTransitions.get(i).cleanUpOnFailure();
@@ -200,7 +202,6 @@ class TransitionController { 
        if (mCollectingTransition != null) {

            mCollectingTransition.abort();

        }

        mTransitionPlayer = null;

        mTransitionPlayerProc = null;

        mRemotePlayer.clear();

        mRunningLock.doNotifyLocked();