Merge "Fix transition return issues when more than 1 level depth" into rvc-dev am: 9aa8852510 am: cd991f9b3c am: 6084e4c0ad

Change-Id: I81f584b0896136b8fc31632a1a5ff7b4f1359349
2020-05-29 05:09:29 +00:00
parent 01ea3eb8a7 6084e4c0ad
commit 7d4b99d7cd
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/app/ExitTransitionCoordinator.java
+++ b/core/java/android/app/ExitTransitionCoordinator.java
@@ -434,7 +434,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
                mSharedElementNotified = true;
                delayCancel();

-                if (!mActivity.isTopOfTask()) {
+                if (!mActivity.isTopOfTask() || (mIsReturning && !mActivity.isTaskRoot()
+                        && !mSharedElements.isEmpty())) {
                    mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null);
                }