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

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

Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev

parents 685a8770 ca5094a0

core/java/android/app/ActivityTransitionCoordinator.java

+2 −1
Original line number Diff line number Diff line
@@ -638,6 +638,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
        if (decorView != null) {

            decorView.getLocationOnScreen(decorLoc);

        }

        Matrix tempMatrix = new Matrix();

        for (String name: names) {

            Bundle sharedElementBundle = state.getBundle(name);

            if (sharedElementBundle != null) {
@@ -647,7 +648,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
                    snapshot = mListener.onCreateSnapshotView(context, parcelable);

                }

                if (snapshot != null) {

                    setSharedElementState(snapshot, name, state, null, null, decorLoc);

                    setSharedElementState(snapshot, name, state, tempMatrix, null, decorLoc);

                }

                snapshots.add(snapshot);

            }