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

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

Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev

parents bebc5620 7fa7da22

core/java/android/app/EnterTransitionCoordinator.java

+3 −2
Original line number Diff line number Diff line
@@ -136,11 +136,12 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
        if (sharedElements.isEmpty() || !sharedElements.valueAt(0).isLayoutRequested()) {

            viewsReady(sharedElements);

        } else {

            sharedElements.valueAt(0).getViewTreeObserver()

            final View sharedElement = sharedElements.valueAt(0);

            sharedElement.getViewTreeObserver()

                    .addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {

                @Override

                public boolean onPreDraw() {

                    sharedElements.valueAt(0).getViewTreeObserver().removeOnPreDrawListener(this);

                    sharedElement.getViewTreeObserver().removeOnPreDrawListener(this);

                    viewsReady(sharedElements);

                    return true;

                }