From f42a83a41329a722539269aac35f271bf600d8bd Mon Sep 17 00:00:00 2001 From: Pedro Loureiro Date: Fri, 10 Mar 2023 16:58:20 +0000 Subject: [PATCH] Use new DeviceConfig.SYNC_DISABLED_MODE_* constants The constants were refactored from Settings.Config (as hidden APIs) into DeviceConfig (as System APIs). Bug: 271870457 Test: presubmit Change-Id: Ib8d689b8610ff8cd49482ad23ffa4d120cf355bb Merged-In: I7ce69fca7c680e91938f1f7798f7f33bf28849a9 --- core/java/android/provider/Settings.java | 21 ++++++++++++++---- .../android/provider/DeviceConfigTest.java | 22 +++++++++---------- .../providers/settings/SettingsProvider.java | 6 ++--- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 127c7a0476f65..42f4a5d4d3105 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -18582,7 +18582,7 @@ public final class Settings { * The modes that can be used when disabling syncs to the 'config' settings. * @hide */ - @IntDef(prefix = "DISABLE_SYNC_MODE_", + @IntDef(prefix = "SYNC_DISABLED_MODE_", value = { SYNC_DISABLED_MODE_NONE, SYNC_DISABLED_MODE_PERSISTENT, SYNC_DISABLED_MODE_UNTIL_REBOOT }) @Retention(RetentionPolicy.SOURCE) @@ -18592,23 +18592,36 @@ public final class Settings { /** * Sync is not disabled. * + * @deprecated use the constant in DeviceConfig + * * @hide */ - public static final int SYNC_DISABLED_MODE_NONE = 0; + @Deprecated + public static final int SYNC_DISABLED_MODE_NONE = DeviceConfig.SYNC_DISABLED_MODE_NONE; /** * Disabling of Config bulk update / syncing is persistent, i.e. it survives a device * reboot. + * + * @deprecated use the constant in DeviceConfig + * * @hide */ - public static final int SYNC_DISABLED_MODE_PERSISTENT = 1; + @Deprecated + public static final int SYNC_DISABLED_MODE_PERSISTENT = + DeviceConfig.SYNC_DISABLED_MODE_PERSISTENT; /** * Disabling of Config bulk update / syncing is not persistent, i.e. it will not survive a * device reboot. + * + * @deprecated use the constant in DeviceConfig + * * @hide */ - public static final int SYNC_DISABLED_MODE_UNTIL_REBOOT = 2; + @Deprecated + public static final int SYNC_DISABLED_MODE_UNTIL_REBOOT = + DeviceConfig.SYNC_DISABLED_MODE_UNTIL_REBOOT; /** * The content:// style URL for the config table. diff --git a/core/tests/coretests/src/android/provider/DeviceConfigTest.java b/core/tests/coretests/src/android/provider/DeviceConfigTest.java index aa1853f500281..1ea20f1626803 100644 --- a/core/tests/coretests/src/android/provider/DeviceConfigTest.java +++ b/core/tests/coretests/src/android/provider/DeviceConfigTest.java @@ -803,51 +803,51 @@ public class DeviceConfigTest { try { // Ensure the device starts in a known state. - DeviceConfig.setSyncDisabledMode(Settings.Config.SYNC_DISABLED_MODE_NONE); + DeviceConfig.setSyncDisabledMode(DeviceConfig.SYNC_DISABLED_MODE_NONE); // Assert starting state. assertThat(DeviceConfig.getSyncDisabledMode()) - .isEqualTo(Settings.Config.SYNC_DISABLED_MODE_NONE); + .isEqualTo(DeviceConfig.SYNC_DISABLED_MODE_NONE); assertThat(DeviceConfig.setProperties(properties1)).isTrue(); assertThat(DeviceConfig.getProperties(NAMESPACE, KEY).getString(KEY, DEFAULT_VALUE)) .isEqualTo(VALUE); // Test disabled (persistent). Persistence is not actually tested, that would require // a host test. - DeviceConfig.setSyncDisabledMode(Settings.Config.SYNC_DISABLED_MODE_PERSISTENT); + DeviceConfig.setSyncDisabledMode(DeviceConfig.SYNC_DISABLED_MODE_PERSISTENT); assertThat(DeviceConfig.getSyncDisabledMode()) - .isEqualTo(Settings.Config.SYNC_DISABLED_MODE_PERSISTENT); + .isEqualTo(DeviceConfig.SYNC_DISABLED_MODE_PERSISTENT); assertThat(DeviceConfig.setProperties(properties2)).isFalse(); assertThat(DeviceConfig.getProperties(NAMESPACE, KEY).getString(KEY, DEFAULT_VALUE)) .isEqualTo(VALUE); // Return to not disabled. - DeviceConfig.setSyncDisabledMode(Settings.Config.SYNC_DISABLED_MODE_NONE); + DeviceConfig.setSyncDisabledMode(DeviceConfig.SYNC_DISABLED_MODE_NONE); assertThat(DeviceConfig.getSyncDisabledMode()) - .isEqualTo(Settings.Config.SYNC_DISABLED_MODE_NONE); + .isEqualTo(DeviceConfig.SYNC_DISABLED_MODE_NONE); assertThat(DeviceConfig.setProperties(properties2)).isTrue(); assertThat(DeviceConfig.getProperties(NAMESPACE, KEY).getString(KEY, DEFAULT_VALUE)) .isEqualTo(VALUE2); // Test disabled (persistent). Absence of persistence is not actually tested, that would // require a host test. - DeviceConfig.setSyncDisabledMode(Settings.Config.SYNC_DISABLED_MODE_UNTIL_REBOOT); + DeviceConfig.setSyncDisabledMode(DeviceConfig.SYNC_DISABLED_MODE_UNTIL_REBOOT); assertThat(DeviceConfig.getSyncDisabledMode()) - .isEqualTo(Settings.Config.SYNC_DISABLED_MODE_UNTIL_REBOOT); + .isEqualTo(DeviceConfig.SYNC_DISABLED_MODE_UNTIL_REBOOT); assertThat(DeviceConfig.setProperties(properties1)).isFalse(); assertThat(DeviceConfig.getProperties(NAMESPACE, KEY).getString(KEY, DEFAULT_VALUE)) .isEqualTo(VALUE2); // Return to not disabled. - DeviceConfig.setSyncDisabledMode(Settings.Config.SYNC_DISABLED_MODE_NONE); + DeviceConfig.setSyncDisabledMode(DeviceConfig.SYNC_DISABLED_MODE_NONE); assertThat(DeviceConfig.getSyncDisabledMode()) - .isEqualTo(Settings.Config.SYNC_DISABLED_MODE_NONE); + .isEqualTo(DeviceConfig.SYNC_DISABLED_MODE_NONE); assertThat(DeviceConfig.setProperties(properties1)).isTrue(); assertThat(DeviceConfig.getProperties(NAMESPACE, KEY).getString(KEY, DEFAULT_VALUE)) .isEqualTo(VALUE); } finally { // Try to return to the default sync disabled state in case of failure. - DeviceConfig.setSyncDisabledMode(Settings.Config.SYNC_DISABLED_MODE_NONE); + DeviceConfig.setSyncDisabledMode(DeviceConfig.SYNC_DISABLED_MODE_NONE); // NAMESPACE will be cleared by cleanUp() } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 7607909dc40b1..7e89bfce7255c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -19,9 +19,9 @@ package com.android.providers.settings; import static android.os.Process.ROOT_UID; import static android.os.Process.SHELL_UID; import static android.os.Process.SYSTEM_UID; -import static android.provider.Settings.Config.SYNC_DISABLED_MODE_NONE; -import static android.provider.Settings.Config.SYNC_DISABLED_MODE_PERSISTENT; -import static android.provider.Settings.Config.SYNC_DISABLED_MODE_UNTIL_REBOOT; +import static android.provider.DeviceConfig.SYNC_DISABLED_MODE_NONE; +import static android.provider.DeviceConfig.SYNC_DISABLED_MODE_PERSISTENT; +import static android.provider.DeviceConfig.SYNC_DISABLED_MODE_UNTIL_REBOOT; import static android.provider.Settings.SET_ALL_RESULT_DISABLED; import static android.provider.Settings.SET_ALL_RESULT_FAILURE; import static android.provider.Settings.SET_ALL_RESULT_SUCCESS;