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

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

Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev

parents 6690e3a1 f31d83ce

core/java/android/app/EnterTransitionCoordinator.java

+6 −4
Original line number Diff line number Diff line
@@ -194,10 +194,12 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
                        @Override

                        public boolean onPreDraw() {

                            getDecor().getViewTreeObserver().removeOnPreDrawListener(this);

                            if (mResultReceiver != null) {

                                Bundle state = captureSharedElementState();

                                setSharedElementMatrices();

                                moveSharedElementsToOverlay();

                                mResultReceiver.send(MSG_SHARED_ELEMENT_DESTINATION, state);

                            }

                            return true;

                        }

                    });