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

Commit 21d7e173 authored by Garfield Tan's avatar Garfield Tan
Browse files

Skip calculating launch params if there is no root activity. 

Bug: 117810579
Test: atest FrameworksServicesTests:TaskLaunchParamsModifierTests
Change-Id: Ic4c506ab3221cf8082b15b714c1cd82b26e969d0
parent 9ad6ab59

services/core/java/com/android/server/am/TaskLaunchParamsModifier.java

+20 −6
Original line number Diff line number Diff line
@@ -114,6 +114,26 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
    private int calculate(TaskRecord task, ActivityInfo.WindowLayout layout,

            ActivityRecord activity, ActivityRecord source, ActivityOptions options,

            LaunchParams currentParams, LaunchParams outParams) {

        final ActivityRecord root;

        if (task != null) {

            root = task.getRootActivity() == null ? activity : task.getRootActivity();

        } else {

            root = activity;

        }



        // TODO: Investigate whether we can safely ignore all cases where we don't have root

        // activity available. Note we can't know if the bounds are valid if we're not sure of the

        // requested orientation of the root activity. Therefore if we found such a case we may need

        // to pass the activity into this modifier in that case.

        if (root == null) {

            // There is a case that can lead us here. The caller is moving the top activity that is

            // in a task that has multiple activities to PIP mode. For that the caller is creating a

            // new task to host the activity so that we only move the top activity to PIP mode and

            // keep other activities in the previous task. There is no point to apply the launch

            // logic in this case.

            return RESULT_SKIP;

        }



        // STEP 1: Determine the display to launch the activity/task.

        final int displayId = getPreferredLaunchDisplay(options, source, currentParams);

        outParams.mPreferredDisplayId = displayId;
@@ -123,12 +143,6 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
                    + display.getWindowingMode());

        }



        final ActivityRecord root;

        if (task != null) {

            root = (task.getRootActivity() == null ? activity : task.getRootActivity());

        } else {

            root = activity;

        }

        // STEP 2: Resolve launch windowing mode.

        // STEP 2.1: Determine if any parameter has specified initial bounds. That might be the

        // launch bounds from activity options, or size/gravity passed in layout. It also treats the

services/tests/servicestests/src/com/android/server/am/TaskLaunchParamsModifierTests.java

+8 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static android.util.DisplayMetrics.DENSITY_DEFAULT; 
import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_CONTINUE;

import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_SKIP;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;
@@ -97,6 +98,13 @@ public class TaskLaunchParamsModifierTests extends ActivityTestsBase { 
        mResult.reset();

    }



    @Test

    public void testReturnsSkipWithEmptyActivity() {

        final TaskRecord task = new TaskBuilder(mSupervisor).build();

        assertEquals(RESULT_SKIP, mTarget.onCalculate(task, /* layout */ null,

                /* activity */ null, /* source */ null, /* options */ null, mCurrent, mResult));

    }



    // =============================

    // Display ID Related Tests

    // =============================