diff options
| author | George Mount <mount@google.com> | 2014-10-30 23:11:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-30 23:11:53 +0000 |
| commit | 57928195a89971e89273c4ef06397d78b0bd0233 (patch) | |
| tree | df8703ef5a20cd8218c39a542bce73d1735620fc /core/java | |
| parent | 685a8770c018d02080d29f18fcb9e50a182912aa (diff) | |
| parent | ca5094a05ce177c586f873ad556e7afc2656fe12 (diff) | |
| download | frameworks_base-57928195a89971e89273c4ef06397d78b0bd0233.zip frameworks_base-57928195a89971e89273c4ef06397d78b0bd0233.tar.gz frameworks_base-57928195a89971e89273c4ef06397d78b0bd0233.tar.bz2 | |
Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ActivityTransitionCoordinator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java index 82b6e35..9062892 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); } |