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

Commit f31d83ce authored by George Mount's avatar George Mount
Browse files

Fix NPE in EnterTransitionCoordinator. 

Bug 17324730

Change-Id: I2a8c5a4b82a7a252d4ac2319a26f3610b8e358ac
parent 3e294e99

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;

                        }

                    });