Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev

2020-06-22 03:04:37 +00:00
parent 6e7e3564f7 79f5a49b3c
commit 48e9dc67f1
1 changed files with 1 additions and 2 deletions
--- 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);
                }