diff options
| author | George Mount <mount@google.com> | 2014-09-10 21:47:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-10 21:47:58 +0000 |
| commit | 05c4f7ad765e2178e6e28676fd3438d2aaa38894 (patch) | |
| tree | c315d1f1afec0cf8b804b098479cd2abc5f0232a | |
| parent | bebc56209d489a61c339d92b5fa8403bc1a76952 (diff) | |
| parent | 7fa7da221ef10113cda33c1cdc5810fe5ed0e00b (diff) | |
| download | frameworks_base-05c4f7ad765e2178e6e28676fd3438d2aaa38894.zip frameworks_base-05c4f7ad765e2178e6e28676fd3438d2aaa38894.tar.gz frameworks_base-05c4f7ad765e2178e6e28676fd3438d2aaa38894.tar.bz2 | |
Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
| -rw-r--r-- | core/java/android/app/EnterTransitionCoordinator.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java index 9c7728e..922561d 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; } |