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

Commit aabfff1f authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Make sure activity is started in requested windowing mode" into sc-dev

parents 49e4e7e1 e99aa999

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

+6 −0
Original line number Diff line number Diff line
@@ -2633,6 +2633,12 @@ class ActivityStarter { 
                mOptions = null;

            }

        }



        if (mPreferredWindowingMode != WINDOWING_MODE_UNDEFINED

                && intentTask.getWindowingMode() != mPreferredWindowingMode) {

            intentTask.setWindowingMode(mPreferredWindowingMode);

        }



        // Need to update mTargetRootTask because if task was moved out of it, the original root

        // task may be destroyed.

        mTargetRootTask = intentActivity.getRootTask();