am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev

* commit '27a08f2ad547934280b626aee9c60dd3a597e6da':
  Use empty snapshots list when there are no shared elements.

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();
-        if (numSharedElements == 0) {
-            return null;
-        }
         ArrayList<View> snapshots = new ArrayList<View>(numSharedElements);
+        if (numSharedElements == 0) {
+            return snapshots;
+        }
         Context context = getWindow().getContext();
         int[] decorLoc = new int[2];
         ViewGroup decorView = getDecor();