summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2014-09-08 10:11:30 -0700
committerGeorge Mount <mount@google.com>2014-09-08 10:19:17 -0700
commit7fa7da221ef10113cda33c1cdc5810fe5ed0e00b (patch)
tree7cb1dc359a787b67d84837fa644662a4d1cb0ccf /core/java
parent8232d822aa97e78e982ed154ac618cde34baac2a (diff)
downloadframeworks_base-7fa7da221ef10113cda33c1cdc5810fe5ed0e00b.zip
frameworks_base-7fa7da221ef10113cda33c1cdc5810fe5ed0e00b.tar.gz
frameworks_base-7fa7da221ef10113cda33c1cdc5810fe5ed0e00b.tar.bz2
Fix ArrayIndexOutOfBoundsException.
Bug 17419926 Change-Id: I211fe9c26d8e489c2a25f93f4076ad290c8c5af6
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/EnterTransitionCoordinator.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index f432c49..3cb7224 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;
}