From 7fa7da221ef10113cda33c1cdc5810fe5ed0e00b Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Mon, 8 Sep 2014 10:11:30 -0700
Subject: Fix ArrayIndexOutOfBoundsException.

Bug 17419926

Change-Id: I211fe9c26d8e489c2a25f93f4076ad290c8c5af6
---
 core/java/android/app/EnterTransitionCoordinator.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index f432c4954f28..3cb722478026 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -136,11 +136,12 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
         if (sharedElements.isEmpty() || !sharedElements.valueAt(0).isLayoutRequested()) {
             viewsReady(sharedElements);
         } else {
-            sharedElements.valueAt(0).getViewTreeObserver()
+            final View sharedElement = sharedElements.valueAt(0);
+            sharedElement.getViewTreeObserver()
                     .addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
                 @Override
                 public boolean onPreDraw() {
-                    sharedElements.valueAt(0).getViewTreeObserver().removeOnPreDrawListener(this);
+                    sharedElement.getViewTreeObserver().removeOnPreDrawListener(this);
                     viewsReady(sharedElements);
                     return true;
                 }
-- 
cgit v1.2.3-59-g8ed1b