diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ExitTransitionCoordinator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java index 68824cd26eaa..fd3eb0618429 100644 --- 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); } |