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

Commit 250b3a44 authored by Eric Lin's avatar Eric Lin
Browse files

Remove per_user_display_window_settings flag in WM server. 

The per_user_display_window_settings flag is in Nextfood for 4+ weeks,
we no longer need this bug fix flag.
No CTS tests reference this flag, confirming safe removal.

Bug: 346668297
Test: atest WmTests:DisplayWindowSettingsProviderTests
Flag: EXEMPT removing com.android.window.flags.per_user_display_window_settings
Change-Id: Ic43cb3159bb85eefabadf66e8759e73293cb3d90
parent 856f2751

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

+0 −11
Original line number Diff line number Diff line
@@ -135,14 +135,3 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}
 


flag {

    namespace: "windowing_sdk"

    name: "per_user_display_window_settings"

    description: "Whether to store display window settings per user to avoid conflicts"

    bug: "346668297"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

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

+3 −13
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import com.android.internal.util.XmlUtils; 
import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;

import com.android.server.wm.DisplayWindowSettings.SettingsProvider;

import com.android.window.flags.Flags;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -145,9 +144,6 @@ class DisplayWindowSettingsProvider implements SettingsProvider { 
     * @see #DATA_DISPLAY_SETTINGS_FILE_PATH

     */

    void setOverrideSettingsForUser(@UserIdInt int userId) {

        if (!Flags.perUserDisplayWindowSettings()) {

            return;

        }

        final AtomicFile settingsFile = getOverrideSettingsFileForUser(userId);

        setOverrideSettingsStorage(new AtomicFileStorage(settingsFile));

    }
@@ -165,9 +161,6 @@ class DisplayWindowSettingsProvider implements SettingsProvider { 
     */

    void removeStaleDisplaySettingsLocked(@NonNull WindowManagerService wms,

            @NonNull RootWindowContainer root) {

        if (!Flags.perUserDisplayWindowSettings()) {

            return;

        }

        final Set<String> displayIdentifiers = new ArraySet<>();

        final Consumer<DisplayInfo> addDisplayIdentifier =

                displayInfo -> displayIdentifiers.add(mOverrideSettings.getIdentifier(displayInfo));
@@ -403,12 +396,9 @@ class DisplayWindowSettingsProvider implements SettingsProvider { 


    @NonNull

    private static AtomicFile getOverrideSettingsFileForUser(@UserIdInt int userId) {

        final File directory;

        if (userId == USER_SYSTEM || !Flags.perUserDisplayWindowSettings()) {

            directory = Environment.getDataDirectory();

        } else {

            directory = Environment.getDataSystemCeDirectory(userId);

        }

        final File directory = (userId == USER_SYSTEM)

                ? Environment.getDataDirectory()

                : Environment.getDataSystemCeDirectory(userId);

        final File overrideSettingsFile = new File(directory, DATA_DISPLAY_SETTINGS_FILE_PATH);

        return new AtomicFile(overrideSettingsFile, WM_DISPLAY_COMMIT_TAG);

    }

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

+0 −5
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotEquals;

import static org.junit.Assert.assertTrue;

import static org.junit.Assume.assumeTrue;

import static org.mockito.ArgumentMatchers.eq;

import static org.testng.Assert.assertFalse;
@@ -357,8 +356,6 @@ public class DisplayWindowSettingsProviderTests extends WindowTestsBase { 


    @Test

    public void testRemovesStaleDisplaySettings_defaultDisplay_removesStaleDisplaySettings() {

        assumeTrue(com.android.window.flags.Flags.perUserDisplayWindowSettings());



        // Write density setting for second display then remove it.

        final DisplayWindowSettingsProvider provider = new DisplayWindowSettingsProvider(

                mDefaultVendorSettingsStorage, mOverrideSettingsStorage);
@@ -387,8 +384,6 @@ public class DisplayWindowSettingsProviderTests extends WindowTestsBase { 


    @Test

    public void testRemovesStaleDisplaySettings_displayNotInLayout_keepsDisplaySettings() {

        assumeTrue(com.android.window.flags.Flags.perUserDisplayWindowSettings());



        // Write density setting for primary display.

        final DisplayWindowSettingsProvider provider = new DisplayWindowSettingsProvider(

                mDefaultVendorSettingsStorage, mOverrideSettingsStorage);