Merge "Fix SettingsStateTest#testNoWriteForVirtualDevice" into main (bc5831d7) · Commits · e / os / android_frameworks_base

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

+17 −15

Original line number	Diff line number	Diff line
		@@ -358,13 +358,12 @@ public class SettingsStateTest {
		SettingsState.makeKey(SettingsState.SETTINGS_TYPE_GLOBAL, 1,
		Context.DEVICE_ID_DEFAULT),
		SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, Looper.getMainLooper());
		synchronized (lock) {
		ssWriter.setVersionLocked(SettingsState.SETTINGS_VERSION_NEW_ENCODING);

		ssWriter.insertSettingLocked("k1", "\u0000", null, false, "package");
		ssWriter.insertSettingLocked("k2", "abc", null, false, "p2");
		ssWriter.insertSettingLocked("k3", null, null, false, "p2");
		ssWriter.insertSettingLocked("k4", CRAZY_STRING, null, false, "p3");
		synchronized (lock) {
		ssWriter.persistSettingsLocked();
		}
		ssWriter.waitForHandler();
		@@ -391,25 +390,28 @@ public class SettingsStateTest {
		@Parameters(method = "getVirtualDeviceIds")
		public void testNoWriteForVirtualDevice(int deviceId) {
		final Object lock = new Object();
		File settingsFile = new File(InstrumentationRegistry.getContext().getCacheDir(),
		"vdsetting.xml");
		settingsFile.delete();
		assertFalse(settingsFile.exists());

		assertFalse(mSettingsFile.exists());
		final SettingsState ssWriter =
		new SettingsState(
		InstrumentationRegistry.getContext(), lock, mSettingsFile,
		InstrumentationRegistry.getContext(), lock, settingsFile,
		SettingsState.makeKey(SettingsState.SETTINGS_TYPE_GLOBAL, 1,
		deviceId),
		SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, Looper.getMainLooper());
		synchronized (lock) {
		ssWriter.setVersionLocked(SettingsState.SETTINGS_VERSION_NEW_ENCODING);

		ssWriter.insertSettingLocked("k1", "\u0000", null, false, "package");
		ssWriter.insertSettingLocked("k2", "abc", null, false, "p2");
		ssWriter.insertSettingLocked("k3", null, null, false, "p2");
		ssWriter.insertSettingLocked("k4", CRAZY_STRING, null, false, "p3");
		synchronized (lock) {
		ssWriter.persistSettingsLocked();
		}
		ssWriter.waitForHandler();
		assertFalse(mSettingsFile.exists());

		assertFalse(settingsFile.exists());
		}

		/**