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

Commit cfff5427 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

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

* commit '57928195':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
parents e1f9f231 57928195

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

            }