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

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

Fix NPE when snapshot ImageView uses ScaleType.MATRIX. 

Bug 18170774

Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
parent a68da938

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);

            }