From f451d8a6d1a454f338e37f99c0867e17ce9e06f1 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Mon, 23 Jun 2014 11:09:32 -0700
Subject: [PATCH] Activity Transitions: Don't do a shared element exit
 transition twice.

Bug 15671433

Change-Id: I888702df5661c769cc1c093d859fd85e5e33d282
---
 core/java/android/app/ExitTransitionCoordinator.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java
index 2dacb10f082b6..18a94684ba806 100644
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -226,13 +226,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
     }
 
     private void startExitTransition() {
-        Transition sharedElementTransition = mSharedElements.isEmpty()
-                ? null : getSharedElementTransition();
-        if (sharedElementTransition == null) {
-            sharedElementTransitionComplete();
-        }
-        Transition transition = mergeTransitions(sharedElementTransition,
-                getExitTransition());
+        Transition transition = getExitTransition();
         if (transition != null) {
             TransitionManager.beginDelayedTransition(getDecor(), transition);
             setViewVisibility(mTransitioningViews, View.INVISIBLE);