From ca5094a05ce177c586f873ad556e7afc2656fe12 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 30 Oct 2014 11:28:00 -0700
Subject: [PATCH] Fix NPE when snapshot ImageView uses ScaleType.MATRIX.

Bug 18170774

Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
---
 core/java/android/app/ActivityTransitionCoordinator.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java
index 82b6e35f9abf6..9062892efde9d 100644
--- a/core/java/android/app/ActivityTransitionCoordinator.java
+++ b/core/java/android/app/ActivityTransitionCoordinator.java
@@ -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);
             }