diff options
| author | George Mount <mount@google.com> | 2014-10-16 14:35:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 14:35:30 +0000 |
| commit | e084c1f1e56444acc84db6e90a2136f6712cc6f8 (patch) | |
| tree | 84c5d79dc8028d0a013cccf1f92910b2f6a78ea2 /core | |
| parent | b4b7f64921a7d6933e553a2f57173d76ff5673ee (diff) | |
| parent | 56789daadf666a24c4644cd3820561566582109f (diff) | |
| download | frameworks_base-e084c1f1e56444acc84db6e90a2136f6712cc6f8.zip frameworks_base-e084c1f1e56444acc84db6e90a2136f6712cc6f8.tar.gz frameworks_base-e084c1f1e56444acc84db6e90a2136f6712cc6f8.tar.bz2 | |
am 56789daa: am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
* commit '56789daadf666a24c4644cd3820561566582109f':
Use empty snapshots list when there are no shared elements.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityTransitionCoordinator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java index 5455a0f..d611058 100644 --- a/core/java/android/app/ActivityTransitionCoordinator.java +++ b/core/java/android/app/ActivityTransitionCoordinator.java @@ -543,10 +543,10 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { protected ArrayList<View> createSnapshots(Bundle state, Collection<String> names) { int numSharedElements = names.size(); + ArrayList<View> snapshots = new ArrayList<View>(numSharedElements); if (numSharedElements == 0) { - return null; + return snapshots; } - ArrayList<View> snapshots = new ArrayList<View>(numSharedElements); Context context = getWindow().getContext(); int[] decorLoc = new int[2]; ViewGroup decorView = getDecor(); |