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

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

Set the candidate task windowing mode 

A fullscreen task was unable to be started in to freefrom mode.
The behavior was broken after commit bbcd3435.

Bug: 229052728
Test: Start a recent task in freefrom
Test: atest ActivityStarterTests
Test: atest PinnedStackTests#testDisplayMetricsPinUnpin
Change-Id: I11bc49983a876da3f903dd2753fd8d2d447e2626
parent 1b43c023

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

+0 −5
Original line number Diff line number Diff line
@@ -2809,11 +2809,6 @@ class ActivityStarter { 
            }

        }



        if (mPreferredWindowingMode != WINDOWING_MODE_UNDEFINED

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

            intentTask.setWindowingMode(mPreferredWindowingMode);

        }



        // Update the target's launch cookie to those specified in the options if set

        if (mStartActivity.mLaunchCookie != null) {

            intentActivity.mLaunchCookie = mStartActivity.mLaunchCookie;

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

+5 −0
Original line number Diff line number Diff line
@@ -977,6 +977,11 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
                    candidateTask.reparent(this, onTop);

                }

            }

            // Update windowing mode if necessary, e.g. launch into a different windowing mode.

            if (windowingMode != WINDOWING_MODE_UNDEFINED && candidateTask.isRootTask()

                    && candidateTask.getWindowingMode() != windowingMode) {

                candidateTask.setWindowingMode(windowingMode);

            }

            return candidateTask.getRootTask();

        }

        return new Task.Builder(mAtmService)