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

Commit 2043096e authored by Chris Li's avatar Chris Li
Browse files

Cleanup update_task_min_dimensions_with_root_activity 

Bug: 416987720
Test: Flag cleanup
Flag: EXEMPT cleanup
Change-Id: Ied91d41f4439825d9d881eebff45bddbe9560a0f
parent 066af6b5

core/java/android/app/TaskInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -571,8 +571,7 @@ public class TaskInfo { 
                && appCompatTaskInfo.equalsForTaskOrganizer(that.appCompatTaskInfo)

                && Objects.equals(topActivityMainWindowFrame, that.topActivityMainWindowFrame)

                && isAppBubble == that.isAppBubble

                && (!com.android.window.flags.Flags.updateTaskMinDimensionsWithRootActivity()

                || (minWidth == that.minWidth && minHeight == that.minHeight));

                && minWidth == that.minWidth && minHeight == that.minHeight;

    }



    /**

core/java/android/window/flags/windowing_sdk.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -119,16 +119,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    namespace: "windowing_sdk"

    name: "update_task_min_dimensions_with_root_activity"

    description: "Update minWidth/Height when the root activity is changed."

    bug: "416987720"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "windowing_sdk"

    name: "fallback_to_focused_display"

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

+8 −18
Original line number Diff line number Diff line
@@ -698,9 +698,6 @@ class Task extends TaskFragment { 
        mResizeMode = resizeMode;

        if (info != null) {

            setIntent(_intent, info);

            if (!Flags.updateTaskMinDimensionsWithRootActivity()) {

                setMinDimensions(info);

            }

        } else {

            intent = _intent;

            mMinWidth = minWidth;
@@ -731,9 +728,6 @@ class Task extends TaskFragment { 
        voiceSession = _voiceSession;

        voiceInteractor = _voiceInteractor;

        setIntent(activity, intent, info);

        if (!Flags.updateTaskMinDimensionsWithRootActivity()) {

            setMinDimensions(info);

        }

        // Before we began to reuse a root task as the leaf task, we used to

        // create a leaf task in this case. Therefore now we won't send out the task created

        // notification when we decide to reuse it here, so we send out the notification below.
@@ -1067,11 +1061,9 @@ class Task extends TaskFragment { 
            mResizeMode = info.resizeMode;

            shouldUpdateTaskDescription = true;

        }

        if (Flags.updateTaskMinDimensionsWithRootActivity()) {

        if (setMinDimensions(info)) {

            shouldUpdateTaskDescription = true;

        }

        }

        if (shouldUpdateTaskDescription) {

            updateTaskDescription();

        }
@@ -1103,14 +1095,12 @@ class Task extends TaskFragment { 
        }

        mMinWidth = minWidth;

        mMinHeight = minHeight;

        if (Flags.updateTaskMinDimensionsWithRootActivity()) {

        // Only update for pure TaskFragment.

        forAllTaskFragments(tf -> {

            if (tf.asTask() == null) {

                tf.setMinDimensions(minWidth, minHeight);

            }

        });

        }

        return true;

    }

services/tests/wmtests/src/com/android/server/wm/TaskTests.java

+0 −2
Original line number Diff line number Diff line
@@ -2223,7 +2223,6 @@ public class TaskTests extends WindowTestsBase { 
        assertFalse(task.isForceExcludedFromRecents());

    }



    @EnableFlags(Flags.FLAG_UPDATE_TASK_MIN_DIMENSIONS_WITH_ROOT_ACTIVITY)

    @Test

    public void testAllowRelingquish_updateMinDimensions() {

        // r0 allows relingquish
@@ -2248,7 +2247,6 @@ public class TaskTests extends WindowTestsBase { 
        assertEquals(500, task.mMinHeight);

    }



    @EnableFlags(Flags.FLAG_UPDATE_TASK_MIN_DIMENSIONS_WITH_ROOT_ACTIVITY)

    @Test

    public void testDisallowRelingquish_notUpdateMinDimensions() {

        // r0 disallows relingquish