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

Commit ccfd4b8f authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Ensure transfer starting window transaction occur in order." into main

parents 3a7a0c84 9e0bb2c1

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

+5 −0
Original line number Diff line number Diff line
@@ -2894,6 +2894,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


    /** Makes starting window always fill the associated task. */

    private void attachStartingSurfaceToAssociatedTask() {

        if (mSyncState == SYNC_STATE_NONE && isEmbedded()) {

            // Collect this activity since it's starting window will reparent to task. To ensure

            // any starting window's transaction will occur in order.

            mTransitionController.collect(this);

        }

        // Associate the configuration of starting window with the task.

        overrideConfigurationPropagation(mStartingWindow, mStartingData.mAssociatedTask);

        getSyncTransaction().reparent(mStartingWindow.mSurfaceControl,