Use empty snapshots list when there are no shared elements.

Bug 17964119

Change-Id: Ia2a63e52623d1e4238b0fd4e25d565451e856834

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java
index 5455a0fdad98..d61105872061 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();