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

Commit 15296559 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14124574

Change-Id: If536d095b87cf2db01907ab90a62fce857cc637b
parents 64e80e92 aabfff1f

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();