From 79f5a49b3cc6d4bb20b8857724560861dfadca3f Mon Sep 17 00:00:00 2001
From: Jeff Chang <chengjeff@google.com>
Date: Sat, 20 Jun 2020 04:15:00 +0000
Subject: [PATCH] Revert "Fix transition return issues when more than 1 level
 depth"

This reverts commit 6d834d86fb2de0c8a85189a01692d45ced3bb79f.

Reason for revert: <http://b/159230864 WhatsApp image is visible after existing a chat>
Bug: 159230864

Change-Id: Ib266cff2e06a82ae9a0e85142ef80ae00328a040
---
 core/java/android/app/ExitTransitionCoordinator.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java
index fd3eb0618429c..68824cd26eaaf 100644
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -434,8 +434,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
                 mSharedElementNotified = true;
                 delayCancel();
 
-                if (!mActivity.isTopOfTask() || (mIsReturning && !mActivity.isTaskRoot()
-                        && !mSharedElements.isEmpty())) {
+                if (!mActivity.isTopOfTask()) {
                     mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null);
                 }