Merge "Respect forceNonSystemPackage param when creating new Setting objects." (71b8672f) · Commits · e / os / android_frameworks_base

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -375,6 +375,24 @@ public class DeviceConfigTest {
		assertThat(result).isEqualTo(newValue);
		}

		@Test
		public void resetToDefault_makeDefault() {
		DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, true);
		assertThat(DeviceConfig.getProperty(NAMESPACE, KEY)).isEqualTo(VALUE);

		DeviceConfig.resetToDefaults(Settings.RESET_MODE_PACKAGE_DEFAULTS, NAMESPACE);
		assertThat(DeviceConfig.getProperty(NAMESPACE, KEY)).isEqualTo(VALUE);
		}

		@Test
		public void resetToDefault_doNotMakeDefault() {
		DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false);
		assertThat(DeviceConfig.getProperty(NAMESPACE, KEY)).isEqualTo(VALUE);

		DeviceConfig.resetToDefaults(Settings.RESET_MODE_PACKAGE_DEFAULTS, NAMESPACE);
		assertThat(DeviceConfig.getProperty(NAMESPACE, KEY)).isNull();
		}

		@Test
		public void getProperties_fullNamespace() {
		Properties properties = DeviceConfig.getProperties(NAMESPACE);

+8 −3

Original line number	Diff line number	Diff line
		@@ -425,7 +425,8 @@ final class SettingsState {
		}
		newState = oldState;
		} else {
		newState = new Setting(name, value, makeDefault, packageName, tag);
		newState = new Setting(name, value, makeDefault, packageName, tag,
		forceNonSystemPackage);
		mSettings.put(name, newState);
		}

		@@ -1173,11 +1174,15 @@ final class SettingsState {

		public Setting(String name, String value, boolean makeDefault, String packageName,
		String tag) {
		this(name, value, makeDefault, packageName, tag, false);
		}

		Setting(String name, String value, boolean makeDefault, String packageName,
		String tag, boolean forceNonSystemPackage) {
		this.name = name;
		// overrideableByRestore = true as the first initialization isn't considered a
		// modification.
		update(value, makeDefault, packageName, tag, false,
		/* overrideableByRestore */ true);
		update(value, makeDefault, packageName, tag, forceNonSystemPackage, true);
		}

		public Setting(String name, String value, String defaultValue,