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

Commit 9108e121 authored by wilsonshih's avatar wilsonshih
Browse files

Remove flag ensure_starting_window_remove_from_task 

Fix: 442303000
Flag: EXEMPT flag removal
Test: build
Change-Id: Ia9264803a74e881c7c8f0a21467f63c34276b13a
parent 2c325801

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

+0 −11
Original line number Original line Diff line number Diff line
@@ -403,17 +403,6 @@ flag { 
    bug: "424146227"

    bug: "424146227"

}

}





flag {

    name: "ensure_starting_window_remove_from_task"

    namespace: "windowing_frontend"

    description: "Trigger the removal of the starting window from the task in case the shared starting data is not attached to itself."

    bug: "405253899"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

flag {

    name: "polish_close_wallpaper_includes_open_change"

    name: "polish_close_wallpaper_includes_open_change"

    namespace: "windowing_frontend"

    namespace: "windowing_frontend"

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

+4 −15
Original line number Original line Diff line number Diff line
@@ -5410,8 +5410,7 @@ final class ActivityRecord extends WindowToken { 
                    && mDisplayContent.mInputMethodWindow != null

                    && mDisplayContent.mInputMethodWindow != null

                    && mDisplayContent.mInputMethodWindow.isVisible();

                    && mDisplayContent.mInputMethodWindow.isVisible();

            finishOrAbortReplacingWindow();

            finishOrAbortReplacingWindow();

            if (Flags.ensureStartingWindowRemoveFromTask() && !firstWindowDrawn && task != null

            if (!firstWindowDrawn && task != null && task.mSharedStartingData != null) {

                    && task.mSharedStartingData != null) {

                final ActivityRecord r = getSharedStartingWindowOwnerIfTaskDrawn();

                final ActivityRecord r = getSharedStartingWindowOwnerIfTaskDrawn();

                if (r != null) {

                if (r != null) {

                    r.removeStartingWindow();

                    r.removeStartingWindow();
@@ -6529,20 +6528,10 @@ final class ActivityRecord extends WindowToken { 
        if (associatedTask == null) {

        if (associatedTask == null) {

            removeStartingWindow();

            removeStartingWindow();

        } else {

        } else {

            if (Flags.ensureStartingWindowRemoveFromTask()) {

            final ActivityRecord r = getSharedStartingWindowOwnerIfTaskDrawn();

            final ActivityRecord r = getSharedStartingWindowOwnerIfTaskDrawn();

            if (r != null) {

            if (r != null) {

                r.removeStartingWindow();

                r.removeStartingWindow();

            }

            }

            } else if (associatedTask.getActivity(

                    r -> r.isVisibleRequested() && !r.firstWindowDrawn) == null) {

                // The last drawn activity may not be the one that owns the starting window.

                final ActivityRecord r = associatedTask.getActivity(

                        ar -> ar.mStartingData != null);

                if (r != null) {

                    r.removeStartingWindow();

                }

            }

        }

        }

        updateReportedVisibilityLocked();

        updateReportedVisibilityLocked();

    }

    }

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -3202,7 +3202,6 @@ public class ActivityRecordTests extends WindowTestsBase { 
    }

    }





    @Test

    @Test

    @EnableFlags(Flags.FLAG_ENSURE_STARTING_WINDOW_REMOVE_FROM_TASK)

    public void testStartingWindowInTaskFragment_RemoveAfterTrampolineInvisible() {

    public void testStartingWindowInTaskFragment_RemoveAfterTrampolineInvisible() {

        testStartingWindowInTaskFragment_RemoveFrom(false, true);

        testStartingWindowInTaskFragment_RemoveFrom(false, true);

    }

    }