diff options
3 files changed, 3 insertions, 29 deletions
diff --git a/core/java/android/window/flags/windowing_sdk.aconfig b/core/java/android/window/flags/windowing_sdk.aconfig index 4c18bbfbeebf..b8c2a5f8eb6b 100644 --- a/core/java/android/window/flags/windowing_sdk.aconfig +++ b/core/java/android/window/flags/windowing_sdk.aconfig @@ -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 - } -} diff --git a/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java b/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java index 27e6e0997c89..7135c3b8cda8 100644 --- a/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java +++ b/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java @@ -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); } diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsProviderTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsProviderTests.java index 2e0d4d46ec05..2f2b4732f1eb 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsProviderTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsProviderTests.java @@ -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); |