diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java index 9c7728eb90b37..922561d6a8bc0 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; }