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

Commit e99aa999 authored by Louis Chang's avatar Louis Chang
Browse files

Make sure activity is started in requested windowing mode 

An existing activity was brought to front, but was not launched in
requested windowing mode because the task was simply reused without
updating to the preferred windowing mode.

Bug: 177190100
Test: atest WindowMetricsActivityTests#testMetricsMatchesDisplayAreaOnFreeformActivity
Change-Id: I43884c3297995e536e91a81bbb0c290da7aace1c
parent d2793a6c

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