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

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

Merge "Set display id on stack creation"

parents 7e076926 2fcc451d

services/core/java/com/android/server/am/ActivityStack.java

+3 −0
Original line number Diff line number Diff line
@@ -453,6 +453,9 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
        mStackId = stackId;

        mCurrentUser = mService.mUserController.getCurrentUserId();

        mTmpRect2.setEmpty();

        // Set display id before setting activity and window type to make sure it won't affect

        // stacks on a wrong display.

        mDisplayId = display.mDisplayId;

        setActivityType(activityType);

        setWindowingMode(windowingMode);

        mWindowContainerController = createStackWindowController(display.mDisplayId, onTop,