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

Commit 3b61847c authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Execute transition by starting window only if it is forward type 

Otherwise if the onStartingWindowDrawn is called for a transferred
starting window, it may be too early to execute the close transition
which is triggered by previous finishing trampoline activity.

Bug: 206513982
Test: setprop persist.debug.shell_transit 1; reboot
      atest StartActivityTests#testStartActivityFromFinishingActivity
Change-Id: I4ff020384092b2c95ca9038a9a3fcb7515f398d5
parent 07d5ae6a

services/core/java/com/android/server/wm/ActivityRecord.java

+3 −2
Original line number Diff line number Diff line
@@ -5971,10 +5971,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // because it may be a trampoline.

        if (!wasTaskVisible && mStartingData != null && !finishing && !mLaunchedFromBubble

                && !mDisplayContent.mAppTransition.isReady()

                && !mDisplayContent.mAppTransition.isRunning()) {

                && !mDisplayContent.mAppTransition.isRunning()

                && mDisplayContent.isNextTransitionForward()) {

            // The pending transition state will be cleared after the transition is started, so

            // save the state for launching the client later (used by LaunchActivityItem).

            mStartingData.mIsTransitionForward = mDisplayContent.isNextTransitionForward();

            mStartingData.mIsTransitionForward = true;

            mDisplayContent.executeAppTransition();

        }

    }