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

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

Fix NPE when detached View is added as a shared element. 

Bug 17632940

This won't solve all problems in which the parent becomes null,
but it will protect against shared elements being added that aren't
attached when mapped.

Change-Id: I991722c671c57048aea84b59a3c187c77c93450f
parent 80c2e16f

core/java/android/app/ActivityTransitionCoordinator.java

+9 −2
Original line number Diff line number Diff line
@@ -222,8 +222,15 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
        if (mListener != null) {

            mListener.onMapSharedElements(mAllSharedElementNames, sharedElements);

        }

        mSharedElementNames.addAll(sharedElements.keySet());

        mSharedElements.addAll(sharedElements.values());

        int numSharedElements = sharedElements.size();

        for (int i = 0; i < numSharedElements; i++) {

            View sharedElement = sharedElements.valueAt(i);

            String name = sharedElements.keyAt(i);

            if (sharedElement != null && sharedElement.isAttachedToWindow() && name != null) {

                mSharedElements.add(sharedElement);

                mSharedElementNames.add(name);

            }

        }

        if (getViewsTransition() != null && mTransitioningViews != null) {

            ViewGroup decorView = getDecor();

            if (decorView != null) {