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

Merge "Adds DeviceConfig flag configuration banning to SettingsProvider."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-07 13:43:11 +00:00
committed by Android (Google) Code Review
parent 4c5c6c9610 66acc13aef
commit b644ae2000
4 changed files with 242 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/provider/Settings.java
View File

@@ -252,6 +252,9 @@ public final class Settings {
/** @hide */
public static final String EXTRA_NETWORK_TEMPLATE = "network_template";
/** @hide */
public static final String KEY_CONFIG_SET_RETURN = "config_set_return";
/**
* An int extra specifying a subscription ID.
*
@@ -2504,13 +2507,14 @@ public final class Settings {
args.putString(CALL_METHOD_PREFIX_KEY, prefix);
args.putSerializable(CALL_METHOD_FLAGS_KEY, keyValues);
IContentProvider cp = mProviderHolder.getProvider(cr);
cp.call(cr.getPackageName(), cr.getFeatureId(), mProviderHolder.mUri.getAuthority(),
Bundle bundle = cp.call(cr.getPackageName(), cr.getFeatureId(),
mProviderHolder.mUri.getAuthority(),
mCallSetAllCommand, null, args);
return bundle.getBoolean(KEY_CONFIG_SET_RETURN);
} catch (RemoteException e) {
// Not supported by the remote side
return false;
}
return true;
}
@UnsupportedAppUsage
@@ -13985,14 +13989,18 @@ public final class Settings {
*/
@RequiresPermission(Manifest.permission.WRITE_DEVICE_CONFIG)
static boolean setStrings(@NonNull ContentResolver resolver, @NonNull String namespace,
@NonNull Map<String, String> keyValues) {
@NonNull Map<String, String> keyValues) throws DeviceConfig.BadConfigException {
HashMap<String, String> compositeKeyValueMap = new HashMap<>(keyValues.keySet().size());
for (Map.Entry<String, String> entry : keyValues.entrySet()) {
compositeKeyValueMap.put(
createCompositeName(namespace, entry.getKey()), entry.getValue());
}
return sNameValueCache.setStringsForPrefix(resolver, createPrefix(namespace),
compositeKeyValueMap);
// If can't set given configuration that means it's bad
if (!sNameValueCache.setStringsForPrefix(resolver, createPrefix(namespace),
compositeKeyValueMap)) {
throw new DeviceConfig.BadConfigException();
}
return true;
}
/**