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

Commit 1a2fc0f4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add log about adding hidden task"

parents 34d04684 0812325d

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -1496,6 +1496,7 @@ class RecentTasks { 
        final Task removedTask = mTasks.remove(removeIndex);

        final Task removedTask = mTasks.remove(removeIndex);

        if (removedTask != task) {

        if (removedTask != task) {

            if (removedTask.hasChild()) {

            if (removedTask.hasChild()) {

                Slog.i(TAG, "Add " + removedTask + " to hidden list because adding " + task);

                // A non-empty task is replaced by a new task. Because the removed task is no longer

                // A non-empty task is replaced by a new task. Because the removed task is no longer

                // managed by the recent tasks list, add it to the hidden list to prevent the task

                // managed by the recent tasks list, add it to the hidden list to prevent the task

                // from becoming dangling.

                // from becoming dangling.

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

+11 −8
Original line number Original line Diff line number Diff line
@@ -4421,8 +4421,17 @@ class Task extends WindowContainer<WindowContainer> { 
            sb.append(stringName);

            sb.append(stringName);

            sb.append(" U=");

            sb.append(" U=");

            sb.append(mUserId);

            sb.append(mUserId);

            sb.append(" StackId=");

            final Task rootTask = getRootTask();

            sb.append(getRootTaskId());

            if (rootTask != this) {

                sb.append(" rootTaskId=");

                sb.append(rootTask.mTaskId);

            }

            sb.append(" visible=");

            sb.append(shouldBeVisible(null /* starting */));

            sb.append(" mode=");

            sb.append(windowingModeToString(getWindowingMode()));

            sb.append(" translucent=");

            sb.append(isTranslucent(null /* starting */));

            sb.append(" sz=");

            sb.append(" sz=");

            sb.append(getChildCount());

            sb.append(getChildCount());

            sb.append('}');

            sb.append('}');
@@ -4432,10 +4441,7 @@ class Task extends WindowContainer<WindowContainer> { 
        sb.append(Integer.toHexString(System.identityHashCode(this)));

        sb.append(Integer.toHexString(System.identityHashCode(this)));

        sb.append(" #");

        sb.append(" #");

        sb.append(mTaskId);

        sb.append(mTaskId);

        sb.append(" visible=" + shouldBeVisible(null /* starting */));

        sb.append(" type=" + activityTypeToString(getActivityType()));

        sb.append(" type=" + activityTypeToString(getActivityType()));

        sb.append(" mode=" + windowingModeToString(getWindowingMode()));

        sb.append(" translucent=" + isTranslucent(null /* starting */));

        if (affinity != null) {

        if (affinity != null) {

            sb.append(" A=");

            sb.append(" A=");

            sb.append(affinity);

            sb.append(affinity);
@@ -5180,9 +5186,6 @@ class Task extends WindowContainer<WindowContainer> { 




    @Override

    @Override

    public void setWindowingMode(int windowingMode) {

    public void setWindowingMode(int windowingMode) {

        // Reset the cached result of toString()

        stringName = null;



        // Calling Task#setWindowingMode() for leaf task since this is the a specialization of

        // Calling Task#setWindowingMode() for leaf task since this is the a specialization of

        // {@link #setWindowingMode(int)} for ActivityStack.

        // {@link #setWindowingMode(int)} for ActivityStack.

        if (!isRootTask()) {

        if (!isRootTask()) {