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

Commit 48e9dc67 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 6e7e3564 79f5a49b

core/java/android/app/ExitTransitionCoordinator.java

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

                }