From f7461f0c54028da5290605b77b93231ffe545c0b Mon Sep 17 00:00:00 2001 From: Evan Severson Date: Fri, 18 Oct 2019 10:51:23 -0700 Subject: [PATCH] Add permissions namespace to DeviceConfig Test: adb shell device_config put permissions one_time_permissions_timeout_millis 10000 Assert one-time permission revokes in ~10 seconds Bug: 136219229 Change-Id: I5689b10abfb7f5642b5c45f624320d2c6d785016 --- api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/provider/DeviceConfig.java | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/api/system-current.txt b/api/system-current.txt index 46413d39cacac..d53eabf7bb8a8 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5902,6 +5902,7 @@ package android.provider { field public static final String NAMESPACE_MEDIA_NATIVE = "media_native"; field public static final String NAMESPACE_NETD_NATIVE = "netd_native"; field public static final String NAMESPACE_PACKAGE_MANAGER_SERVICE = "package_manager_service"; + field public static final String NAMESPACE_PERMISSIONS = "permissions"; field public static final String NAMESPACE_PRIVACY = "privacy"; field public static final String NAMESPACE_ROLLBACK = "rollback"; field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; diff --git a/api/test-current.txt b/api/test-current.txt index 9b85b96da5ab4..0b89b6fad0446 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2346,6 +2346,7 @@ package android.provider { method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(@NonNull String, @NonNull String, @Nullable String, boolean); field public static final String NAMESPACE_AUTOFILL = "autofill"; field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture"; + field public static final String NAMESPACE_PERMISSIONS = "permissions"; field public static final String NAMESPACE_PRIVACY = "privacy"; field public static final String NAMESPACE_ROLLBACK = "rollback"; field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index e456c8a42e191..8b8afd549c9f4 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -337,6 +337,15 @@ public final class DeviceConfig { @TestApi public static final String NAMESPACE_PRIVACY = "privacy"; + /** + * Permission related properties definitions. + * + * @hide + */ + @SystemApi + @TestApi + public static final String NAMESPACE_PERMISSIONS = "permissions"; + /** * Interface for accessing keys belonging to {@link #NAMESPACE_WINDOW_MANAGER}. * @hide