Add the API surface for DeviceConfig.
Update DeviceConfigService to call DeviceConfig API directly for get,
set, and reset. Remove the duplicated content uris from various places
in favor of the single constant exposed in DeviceConfig.
Test: atest FrameworksCoreTests:DeviceConfigTest
atest FrameworksCoreTests:SettingsProviderTest
atest SettingsProviderTest:DeviceConfigServiceTest
Bug:109919982
Bug:113100523
Bug:113101834
Change-Id: I46d110c4fd29a89af383629d26de4ee39ca852a6
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java
index 3520918..f2b2719 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java
@@ -20,7 +20,6 @@
import android.annotation.SystemApi;
import android.app.ActivityManager;
import android.content.IContentProvider;
-import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
import android.os.Process;
@@ -28,6 +27,7 @@
import android.os.ResultReceiver;
import android.os.ShellCallback;
import android.os.ShellCommand;
+import android.provider.DeviceConfig;
import android.provider.Settings;
import java.io.FileDescriptor;
@@ -46,13 +46,6 @@
*/
@SystemApi
public final class DeviceConfigService extends Binder {
- /**
- * TODO(b/113100523): Move this to DeviceConfig.java when it is added, and expose it as a System
- * API.
- */
- private static final Uri CONFIG_CONTENT_URI =
- Uri.parse("content://" + Settings.AUTHORITY + "/config");
-
final SettingsProvider mProvider;
public DeviceConfigService(SettingsProvider provider) {
@@ -191,10 +184,10 @@
final PrintWriter pout = getOutPrintWriter();
switch (verb) {
case GET:
- pout.println(get(iprovider, namespace, key));
+ pout.println(DeviceConfig.getProperty(namespace, key));
break;
case PUT:
- put(iprovider, namespace, key, value, makeDefault);
+ DeviceConfig.setProperty(namespace, key, value, makeDefault);
break;
case DELETE:
pout.println(delete(iprovider, namespace, key)
@@ -207,7 +200,7 @@
}
break;
case RESET:
- reset(iprovider, resetMode, namespace);
+ DeviceConfig.resetToDefaults(resetMode, namespace);
break;
default:
perr.println("Unspecified command");
@@ -241,43 +234,6 @@
+ "flags are reset");
}
- private String get(IContentProvider provider, String namespace, String key) {
- String compositeKey = namespace + "/" + key;
- String result = null;
- try {
- Bundle args = new Bundle();
- args.putInt(Settings.CALL_METHOD_USER_KEY,
- ActivityManager.getService().getCurrentUser().id);
- Bundle b = provider.call(resolveCallingPackage(), Settings.CALL_METHOD_GET_CONFIG,
- compositeKey, args);
- if (b != null) {
- result = b.getPairValue();
- }
- } catch (RemoteException e) {
- throw new RuntimeException("Failed in IPC", e);
- }
- return result;
- }
-
- private void put(IContentProvider provider, String namespace, String key, String value,
- boolean makeDefault) {
- String compositeKey = namespace + "/" + key;
-
- try {
- Bundle args = new Bundle();
- args.putString(Settings.NameValueTable.VALUE, value);
- args.putInt(Settings.CALL_METHOD_USER_KEY,
- ActivityManager.getService().getCurrentUser().id);
- if (makeDefault) {
- args.putBoolean(Settings.CALL_METHOD_MAKE_DEFAULT_KEY, true);
- }
- provider.call(resolveCallingPackage(), Settings.CALL_METHOD_PUT_CONFIG,
- compositeKey, args);
- } catch (RemoteException e) {
- throw new RuntimeException("Failed in IPC", e);
- }
- }
-
private boolean delete(IContentProvider provider, String namespace, String key) {
String compositeKey = namespace + "/" + key;
boolean success;
@@ -322,20 +278,6 @@
return lines;
}
- private void reset(IContentProvider provider, int resetMode, @Nullable String namespace) {
- try {
- Bundle args = new Bundle();
- args.putInt(Settings.CALL_METHOD_USER_KEY,
- ActivityManager.getService().getCurrentUser().id);
- args.putInt(Settings.CALL_METHOD_RESET_MODE_KEY, resetMode);
- args.putString(Settings.CALL_METHOD_PREFIX_KEY, namespace);
- provider.call(
- resolveCallingPackage(), Settings.CALL_METHOD_RESET_CONFIG, null, args);
- } catch (RemoteException e) {
- throw new RuntimeException("Failed in IPC", e);
- }
- }
-
private static String resolveCallingPackage() {
switch (Binder.getCallingUid()) {
case Process.ROOT_UID: {
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index b071355..ce529a0 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -63,6 +63,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.os.UserManagerInternal;
+import android.provider.DeviceConfig;
import android.provider.Settings;
import android.provider.Settings.Global;
import android.provider.Settings.Secure;
@@ -195,13 +196,6 @@
private static final Set<String> OVERLAY_ALLOWED_SYSTEM_INSTANT_APP_SETTINGS = new ArraySet<>();
private static final Set<String> OVERLAY_ALLOWED_SECURE_INSTANT_APP_SETTINGS = new ArraySet<>();
- /**
- * TODO(b/113100523): Move this to DeviceConfig.java when it is added, and expose it as a System
- * API.
- */
- private static final Uri CONFIG_CONTENT_URI =
- Uri.parse("content://" + Settings.AUTHORITY + "/config");
-
static {
for (String name : Resources.getSystem().getStringArray(
com.android.internal.R.array.config_allowedGlobalInstantAppSettings)) {
@@ -3148,8 +3142,8 @@
private Uri getNotificationUriFor(int key, String name) {
if (isConfigSettingsKey(key)) {
- return (name != null) ? Uri.withAppendedPath(CONFIG_CONTENT_URI, name)
- : CONFIG_CONTENT_URI;
+ return (name != null) ? Uri.withAppendedPath(DeviceConfig.CONTENT_URI, name)
+ : DeviceConfig.CONTENT_URI;
} else if (isGlobalSettingsKey(key)) {
return (name != null) ? Uri.withAppendedPath(Settings.Global.CONTENT_URI, name)
: Settings.Global.CONTENT_URI;
diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/DeviceConfigServiceTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/DeviceConfigServiceTest.java
index 9d0462e..5587cba 100644
--- a/packages/SettingsProvider/test/src/com/android/providers/settings/DeviceConfigServiceTest.java
+++ b/packages/SettingsProvider/test/src/com/android/providers/settings/DeviceConfigServiceTest.java
@@ -21,8 +21,8 @@
import static junit.framework.Assert.assertNull;
import android.content.ContentResolver;
-import android.net.Uri;
import android.os.Bundle;
+import android.provider.DeviceConfig;
import android.provider.Settings;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
@@ -43,12 +43,6 @@
*/
@RunWith(AndroidJUnit4.class)
public class DeviceConfigServiceTest {
- /**
- * TODO(b/113100523): Move this to DeviceConfig.java when it is added, and expose it as a System
- * API.
- */
- private static final Uri CONFIG_CONTENT_URI =
- Uri.parse("content://" + Settings.AUTHORITY + "/config");
private static final String sNamespace = "namespace1";
private static final String sKey = "key1";
private static final String sValue = "value1";
@@ -152,7 +146,7 @@
// make sValue the default value
executeShellCommand(
"device_config put " + sNamespace + " " + sKey + " " + sValue + " default");
- // make newValue the current value
+ // make newValue the current value (as set by a trusted package)
executeShellCommand(
"device_config put " + sNamespace + " " + sKey + " " + newValue);
String result = getFromContentProvider(mContentResolver, sNamespace, sKey);
@@ -161,14 +155,14 @@
// reset values that were set by untrusted packages
executeShellCommand("device_config reset untrusted_defaults " + sNamespace);
result = getFromContentProvider(mContentResolver, sNamespace, sKey);
- // the default value has been restored
- assertEquals(sValue, result);
+ // the current value was set by a trusted package, so it's not reset
+ assertEquals(newValue, result);
- // clear values that were set by untrusted packages
+ // reset values that were set by untrusted or trusted packages
executeShellCommand("device_config reset trusted_defaults " + sNamespace);
result = getFromContentProvider(mContentResolver, sNamespace, sKey);
- // even the default value is gone now
- assertNull(result);
+ // the default value has been restored
+ assertEquals(sValue, result);
}
private static void executeShellCommand(String command) throws IOException {
@@ -190,14 +184,15 @@
if (makeDefault) {
args.putBoolean(Settings.CALL_METHOD_MAKE_DEFAULT_KEY, true);
}
- resolver.call(CONFIG_CONTENT_URI, Settings.CALL_METHOD_PUT_CONFIG, compositeName, args);
+ resolver.call(
+ DeviceConfig.CONTENT_URI, Settings.CALL_METHOD_PUT_CONFIG, compositeName, args);
}
private static String getFromContentProvider(ContentResolver resolver, String namespace,
String key) {
String compositeName = namespace + "/" + key;
Bundle result = resolver.call(
- CONFIG_CONTENT_URI, Settings.CALL_METHOD_GET_CONFIG, compositeName, null);
+ DeviceConfig.CONTENT_URI, Settings.CALL_METHOD_GET_CONFIG, compositeName, null);
assertNotNull(result);
return result.getString(Settings.NameValueTable.VALUE);
}
@@ -206,7 +201,7 @@
String key) {
String compositeName = namespace + "/" + key;
Bundle result = resolver.call(
- CONFIG_CONTENT_URI, Settings.CALL_METHOD_DELETE_CONFIG, compositeName, null);
+ DeviceConfig.CONTENT_URI, Settings.CALL_METHOD_DELETE_CONFIG, compositeName, null);
assertNotNull(result);
return compositeName.equals(result.getString(Settings.NameValueTable.VALUE));
}