Merge "Use new DeviceConfig.SYNC_DISABLED_MODE_* constants" (b866dad2) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+17 −4

Original line number	Diff line number	Diff line
		@@ -18650,7 +18650,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)
		@@ -18660,23 +18660,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.

core/tests/coretests/src/android/provider/DeviceConfigTest.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -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()
		}

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;