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

Commit 825afdd3 authored by Louis Chang's avatar Louis Chang
Browse files

Do not reuse organized task as leaf task 

An organized task was reused as a leaf task and had a direct child
activity. Since there were also other tasks that were reparented to
the organized task, resulted in having activity and task on the
same level of WM hierarchy.

Also correct an output format issue for dumpsys activity

Bug: 181242600
Test: start bubble activity from task bar while in stage split
Change-Id: I07dfbc1912e0cca0b4bef8a52c0ce39722e24652
parent 6a26f105

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

+1 −1
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                        pw.print(Integer.toHexString(taskDescription.getStatusBarColor()));

                        pw.print(" navigationBarColor=");

                        pw.println(Integer.toHexString(taskDescription.getNavigationBarColor()));

                        pw.print(" backgroundColorFloating=");

                        pw.print(prefix); pw.print(" backgroundColorFloating=");

                        pw.println(Integer.toHexString(

                                taskDescription.getBackgroundColorFloating()));

            }

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

+0 −7
Original line number Diff line number Diff line
@@ -5272,13 +5272,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                || windowingMode == WINDOWING_MODE_MULTI_WINDOW);

    }



    static boolean canReuseExistingTask(int windowingMode, int activityType) {

        // Existing Tasks can be reused if a new root task will be created anyway, or for the

        // Dream - because there can only ever be one DreamActivity.

        return alwaysCreateRootTask(windowingMode, activityType)

                || activityType == ACTIVITY_TYPE_DREAM;

    }



    @Nullable

    Task getFocusedRootTask() {

        return getItemFromTaskDisplayAreas(TaskDisplayArea::getFocusedRootTask);

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

+18 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.app.ActivityTaskManager.RESIZE_MODE_FORCED; 
import static android.app.ActivityTaskManager.RESIZE_MODE_SYSTEM_SCREEN_ROTATION;

import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SPLIT_SCREEN;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
@@ -7361,6 +7362,7 @@ class Task extends WindowContainer<WindowContainer> { 
        return reuseOrCreateTask(info, intent, null /*voiceSession*/, null /*voiceInteractor*/,

                toTop, null /*activity*/, null /*source*/, null /*options*/);

    }



    // TODO: Can be removed once we change callpoints creating root tasks to be creating tasks.

    /** Either returns this current task to be re-used or creates a new child task. */

    Task reuseOrCreateTask(ActivityInfo info, Intent intent, IVoiceInteractionSession voiceSession,
@@ -7368,7 +7370,7 @@ class Task extends WindowContainer<WindowContainer> { 
            ActivityRecord source, ActivityOptions options) {



        Task task;

        if (DisplayContent.canReuseExistingTask(getWindowingMode(), getActivityType())) {

        if (canReuseAsLeafTask()) {

            // This root task will only contain one task, so just return itself since all root

            // tasks ara now tasks and all tasks are now root tasks.

            task = reuseAsLeafTask(voiceSession, voiceInteractor, intent, info, activity);
@@ -7403,10 +7405,24 @@ class Task extends WindowContainer<WindowContainer> { 
        return task;

    }



    /** Return {@code true} if this task can be reused as leaf task. */

    private boolean canReuseAsLeafTask() {

        // Cannot be reused as leaf task if this task is created by organizer or having child tasks.

        if (mCreatedByOrganizer || !isLeafTask()) {

            return false;

        }



        // Existing Tasks can be reused if a new root task will be created anyway, or for the

        // Dream - because there can only ever be one DreamActivity.

        final int windowingMode = getWindowingMode();

        final int activityType = getActivityType();

        return DisplayContent.alwaysCreateRootTask(windowingMode, activityType)

                || activityType == ACTIVITY_TYPE_DREAM;

    }



    void addChild(WindowContainer child, final boolean toTop, boolean showForAllUsers) {

        Task task = child.asTask();

        try {



            if (task != null) {

                task.setForceShowForAllUsers(showForAllUsers);

            }