Merge "[SettingsProvider] update per-package memory usage on clearAppData" into main (9edff93d) · Commits · e / os / android_frameworks_base

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

+1 −8

Original line number	Diff line number	Diff line
		@@ -740,8 +740,6 @@ final class SettingsState {
		// The settings provider must hold its lock when calling here.
		@GuardedBy("mLock")
		public void removeSettingsForPackageLocked(String packageName) {
		boolean removedSomething = false;

		final int settingCount = mSettings.size();
		for (int i = settingCount - 1; i >= 0; i--) {
		String name = mSettings.keyAt(i);
		@@ -752,13 +750,8 @@ final class SettingsState {
		}
		Setting setting = mSettings.valueAt(i);
		if (packageName.equals(setting.packageName)) {
		mSettings.removeAt(i);
		removedSomething = true;
		}
		deleteSettingLocked(setting.name);
		}

		if (removedSomething) {
		scheduleWriteIfNeededLocked();
		}
		}

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

+34 −1

Original line number	Diff line number	Diff line
		@@ -987,6 +987,39 @@ public class SettingsStateTest {
		assertEquals(expectedMemUsageForPackage2, settingsState.getMemoryUsage(package2));
		}

		@Test
		public void testMemoryUsagePerPackage_StatsUpdatedOnAppDataCleared() {
		SettingsState settingsState =
		new SettingsState(
		InstrumentationRegistry.getContext(), mLock, mSettingsFile, 1,
		SettingsState.MAX_BYTES_PER_APP_PACKAGE_LIMITED, Looper.getMainLooper());
		final String testKey1 = SETTING_NAME;
		final String testKey2 = SETTING_NAME + "_2";
		final String testValue1 = Strings.repeat("A", 9000);
		final String testValue2 = Strings.repeat("A", 9001);
		final String packageName = "p";
		// Inserting the first setting should be okay
		settingsState.insertSettingLocked(testKey1, testValue1, null, true, packageName);
		int expectedMemUsageForPackage = (testKey1.length() + testValue1.length()
		+ testValue1.length() /* size for default /) Character.BYTES;
		assertEquals(expectedMemUsageForPackage, settingsState.getMemoryUsage(packageName));
		// Inserting the second setting should fail
		try {
		settingsState.insertSettingLocked(testKey2, testValue2, null, true, packageName);
		fail("Should throw because it exceeded max memory usage per package");
		} catch (IllegalStateException ex) {
		assertTrue(ex.getMessage().startsWith("You are adding too many system settings."));
		}
		// Now clear app data and check that the memory usage is cleared
		settingsState.removeSettingsForPackageLocked(packageName);
		assertEquals(0, settingsState.getMemoryUsage(packageName));
		// Try inserting the second setting again and it should go through
		settingsState.insertSettingLocked(testKey2, testValue2, null, true, packageName);
		expectedMemUsageForPackage = (testKey2.length() + testValue2.length()
		+ testValue2.length() /* size for default /) Character.BYTES;
		assertEquals(expectedMemUsageForPackage, settingsState.getMemoryUsage(packageName));
		}

		@Test
		public void testGetFlagOverrideToSync() {
		int configKey = SettingsState.makeKey(SettingsState.SETTINGS_TYPE_CONFIG, 0);