From 83c692efd3c53050fce132dfd2ef21763d3cf010 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 23 Oct 2014 11:11:17 -0700
Subject: [PATCH] Fix NPE when rejected snapshots are null.

Bug 18055705

Change-Id: Id0b98e7da5510af438c5d66c0ddb00489d581864
---
 core/java/android/app/EnterTransitionCoordinator.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index add67f2ec8a52..9bf8b3c8ea6bd 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -322,6 +322,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
         if (mListener != null) {
             mListener.onRejectSharedElements(rejectedSnapshots);
         }
+        removeNullViews(rejectedSnapshots);
         startRejectedAnimations(rejectedSnapshots);
 
         // Now start shared element transition
@@ -370,6 +371,16 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
         }
     }
 
+    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;