Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DeviceConfig: Unban all banned namespaces if any banned one unbanned" into rvc-dev

Browse Source
This commit is contained in:
Hongyi Zhang
2020-04-03 22:17:32 +00:00
committed by Android (Google) Code Review
parent 576e2cc6fe f305f8a9f6
commit b11ab47265
3 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
core/tests/coretests/src/android/provider/DeviceConfigTest.java
View File

@@ -644,15 +644,61 @@ public class DeviceConfigTest {
assertThat(modifiedProperties1.getString(KEY4, DEFAULT_VALUE)).isEqualTo(DEFAULT_VALUE);
Properties modifiedProperties2 = new Properties.Builder(namespaceToBan2).setString(KEY,
VALUE)
.setString(KEY3, NULL_VALUE).setString(KEY4, VALUE2).build();
DeviceConfig.setProperties(modifiedProperties2);
modifiedProperties2 = DeviceConfig.getProperties(namespaceToBan2);
assertThat(modifiedProperties2.getKeyset()).containsExactly(KEY, KEY3, KEY4);
assertThat(modifiedProperties2.getString(KEY, DEFAULT_VALUE)).isEqualTo(VALUE);
assertThat(modifiedProperties2.getString(KEY4, DEFAULT_VALUE)).isEqualTo(VALUE2);
// Since value is null DEFAULT_VALUE should be returned
assertThat(modifiedProperties2.getString(KEY3, DEFAULT_VALUE)).isEqualTo(DEFAULT_VALUE);
}
@Test
public void allConfigsUnbannedIfAnyUnbannedConfigUpdated()
throws DeviceConfig.BadConfigException {
// Given namespaces will be permanently banned, thus they need to be different every time
final String namespaceToBan1 = NAMESPACE + System.currentTimeMillis();
final String namespaceToBan2 = NAMESPACE + System.currentTimeMillis() + 1;
// Set namespaces properties
Properties properties1 = new Properties.Builder(namespaceToBan1).setString(KEY, VALUE)
.setString(KEY4, NULL_VALUE).build();
DeviceConfig.setProperties(properties1);
Properties properties2 = new Properties.Builder(namespaceToBan2).setString(KEY2, VALUE2)
.setString(KEY4, NULL_VALUE).build();
DeviceConfig.setProperties(properties2);
// Ban namespace with related properties
DeviceConfig.resetToDefaults(Settings.RESET_MODE_PACKAGE_DEFAULTS, namespaceToBan1);
DeviceConfig.resetToDefaults(Settings.RESET_MODE_PACKAGE_DEFAULTS, namespaceToBan2);
// Verify given namespace properties are banned
assertThrows(DeviceConfig.BadConfigException.class,
() -> DeviceConfig.setProperties(properties1));
assertThrows(DeviceConfig.BadConfigException.class,
() -> DeviceConfig.setProperties(properties2));
// Modify properties and verify we can set them
Properties modifiedProperties1 = new Properties.Builder(namespaceToBan1).setString(KEY,
VALUE)
.setString(KEY4, NULL_VALUE).setString(KEY2, VALUE2).build();
DeviceConfig.setProperties(modifiedProperties1);
modifiedProperties2 = DeviceConfig.getProperties(namespaceToBan1);
assertThat(modifiedProperties2.getKeyset()).containsExactly(KEY, KEY2, KEY4);
assertThat(modifiedProperties2.getString(KEY, DEFAULT_VALUE)).isEqualTo(VALUE);
assertThat(modifiedProperties2.getString(KEY2, DEFAULT_VALUE)).isEqualTo(VALUE2);
modifiedProperties1 = DeviceConfig.getProperties(namespaceToBan1);
assertThat(modifiedProperties1.getKeyset()).containsExactly(KEY, KEY2, KEY4);
assertThat(modifiedProperties1.getString(KEY, DEFAULT_VALUE)).isEqualTo(VALUE);
assertThat(modifiedProperties1.getString(KEY2, DEFAULT_VALUE)).isEqualTo(VALUE2);
// Since value is null DEFAULT_VALUE should be returned
assertThat(modifiedProperties2.getString(KEY4, DEFAULT_VALUE)).isEqualTo(DEFAULT_VALUE);
assertThat(modifiedProperties1.getString(KEY4, DEFAULT_VALUE)).isEqualTo(DEFAULT_VALUE);
// verify that other banned namespaces are unbanned now.
DeviceConfig.setProperties(properties2);
Properties result = DeviceConfig.getProperties(namespaceToBan2);
assertThat(result.getKeyset()).containsExactly(KEY2, KEY4);
assertThat(result.getString(KEY2, DEFAULT_VALUE)).isEqualTo(VALUE2);
// Since value is null DEFAULT_VALUE should be returned
assertThat(result.getString(KEY4, DEFAULT_VALUE)).isEqualTo(DEFAULT_VALUE);
}
// TODO(mpape): resolve b/142727848 and re-enable listener tests

1
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -2813,6 +2813,7 @@ public class SettingsProvider extends ContentProvider {
if (settingsState.isNewConfigBannedLocked(prefix, keyValues)) {
return false;
}
settingsState.unbanAllConfigIfBannedConfigUpdatedLocked(prefix);
List<String> changedSettings =
settingsState.setSettingsLocked(prefix, keyValues, packageName);
if (!changedSettings.isEmpty()) {

10
packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
View File

@@ -458,6 +458,16 @@ final class SettingsState {
return bannedHash.equals(hashCode(keyValues));
}
@GuardedBy("mLock")
public void unbanAllConfigIfBannedConfigUpdatedLocked(String prefix) {
// If the prefix updated is a banned namespace, clear mNamespaceBannedHashes
// to unban all unbanned namespaces.
if (mNamespaceBannedHashes.get(prefix) != null) {
mNamespaceBannedHashes.clear();
scheduleWriteIfNeededLocked();
}
}
@GuardedBy("mLock")
public void banConfigurationLocked(String prefix, Map<String, String> keyValues) {
if (prefix == null || keyValues.isEmpty()) {