Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36233465 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Fix transition return issues when more than 1 level depth" into rvc-dev am: 9aa88525 am: f7bb82a8 am: 5aaff2f3

Change-Id: I5fb2bc9e45b0e79e447381b2157ca5da7c1474a4
parents 01ea3eb8 5aaff2f3

core/java/android/app/ExitTransitionCoordinator.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

                }