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

Commit 2fcc451d authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Set display id on stack creation 

Set stack display id before setting activity and window type,
because it might accidentally change multi-window mode of a
default display.

Bug: 72048469
Bug: 70564344
Bug: 68952181
Test: ActivityManagerMultiDisplayTests
Change-Id: I5f550bcdfb82f5e615eeeaa7c02efe9a4edad643
parent 66ad3931

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,