commit 83c692efd3c53050fce132dfd2ef21763d3cf010
author George Mount <mount@google.com> Thu Oct 23 11:11:17 2014 -0700
committer George Mount <mount@google.com> Fri Oct 24 15:26:32 2014 -0700
tree a3960265ff9e5d4c1f23f005ae416dbe59ed9891
parent 104d2484ec605d9673e74cc125d92d41b6968327

Fix NPE when rejected snapshots are null.

Bug 18055705

Change-Id: Id0b98e7da5510af438c5d66c0ddb00489d581864

core/java/android/app/EnterTransitionCoordinator.java

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index add67f2..9bf8b3c 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -322,6 +322,7 @@
         if (mListener != null) {
             mListener.onRejectSharedElements(rejectedSnapshots);
         }
+        removeNullViews(rejectedSnapshots);
         startRejectedAnimations(rejectedSnapshots);
 
         // Now start shared element transition
@@ -370,6 +371,16 @@
         }
     }
 
+    private static void removeNullViews(ArrayList<View> views) {
+        if (views != null) {
+            for (int i = views.size() - 1; i >= 0; i--) {
+                if (views.get(i) == null) {
+                    views.remove(i);
+                }
+            }
+        }
+    }
+
     private void onTakeSharedElements() {
         if (!mIsReadyForTransition || mSharedElementsBundle == null) {
             return;