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

Commit 2418d738 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev

parents 135ce76a 4188d0de

core/java/android/app/EnterTransitionCoordinator.java

+4 −1
Original line number Diff line number Diff line
@@ -329,7 +329,10 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
                @Override

                public void run() {

                    if (mAnimations++ < MIN_ANIMATION_FRAMES) {

                        getDecor().postOnAnimation(this);

                        View decorView = getDecor();

                        if (decorView != null) {

                            decorView.postOnAnimation(this);

                        }

                    } else if (mResultReceiver != null) {

                        mResultReceiver.send(MSG_HIDE_SHARED_ELEMENTS, null);

                        mResultReceiver = null; // all done sending messages.