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

Commit c07292aa authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am 48514832: Merge "Fix NPE when clicking "back" quickly." into lmp-dev 

* commit '48514832232eee579a1aab76d51c0adc8a36efc0':
  Fix NPE when clicking "back" quickly.
parents 8d4c198a 0f227c9a

core/java/android/app/EnterTransitionCoordinator.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -327,7 +327,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
                public void run() {

                public void run() {

                    if (mAnimations++ < MIN_ANIMATION_FRAMES) {

                    if (mAnimations++ < MIN_ANIMATION_FRAMES) {

                        getDecor().postOnAnimation(this);

                        getDecor().postOnAnimation(this);

                    } else {

                    } else if (mResultReceiver != null) {

                        mResultReceiver.send(MSG_HIDE_SHARED_ELEMENTS, null);

                        mResultReceiver.send(MSG_HIDE_SHARED_ELEMENTS, null);

                        mResultReceiver = null; // all done sending messages.

                        mResultReceiver = null; // all done sending messages.

                    }

                    }