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

Commit 280ea2d8 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

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

Merge "When detaching player, set to null before clean-up" into udc-dev am: 61c04730 am: cf095499

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22752080



Change-Id: I919c23ab797e6250a2af40123cb70a6fa29d6edc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8962a695 cf095499

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();