diff options
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 6 | ||||
| -rw-r--r-- | core/java/android/provider/DeviceConfig.java | 12 |
3 files changed, 9 insertions, 10 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index b7fc33950642..717d1e827144 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5709,7 +5709,6 @@ package android.provider { method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static void resetToDefaults(int, @Nullable String); method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(String, String, 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_GAME_DRIVER = "game_driver"; field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot"; field public static final String NAMESPACE_NETD_NATIVE = "netd_native"; diff --git a/api/test-current.txt b/api/test-current.txt index 94e83eac96d2..feb75f71ef73 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1783,10 +1783,16 @@ package android.provider { } public final class DeviceConfig { + method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static String getProperty(String, String); method @RequiresPermission("android.permission.WRITE_DEVICE_CONFIG") public static void resetToDefaults(int, @Nullable String); method @RequiresPermission("android.permission.WRITE_DEVICE_CONFIG") public static boolean setProperty(String, String, String, boolean); } + public static interface DeviceConfig.ContentCapture { + field public static final String NAMESPACE = "content_capture"; + field public static final String PROPERTY_CONTENTCAPTURE_ENABLED = "enable_contentcapture"; + } + public static interface DeviceConfig.Privacy { field public static final String NAMESPACE = "privacy"; field public static final String PROPERTY_LOCATION_ACCESS_CHECK_ENABLED = "location_access_check_enabled"; diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 5ac31dc830ce..84cbf0c09372 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -77,6 +77,7 @@ public final class DeviceConfig { * @hide */ @SystemApi + @TestApi public interface ContentCapture { String NAMESPACE = "content_capture"; @@ -101,19 +102,11 @@ public final class DeviceConfig { * @hide */ // TODO(b/121153631): revert back to SERVICE_EXPLICITLY_ENABLED approach + @TestApi String PROPERTY_CONTENTCAPTURE_ENABLED = "enable_contentcapture"; } /** - * Namespace for content capture feature used by on-device machine intelligence - * to provide suggestions in a privacy-safe manner. - * - * @hide - */ - @SystemApi - public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture"; - - /** * Namespace for all input-related features that are used at the native level. * These features are applied at reboot. * @@ -375,6 +368,7 @@ public final class DeviceConfig { * @hide */ @SystemApi + @TestApi @RequiresPermission(READ_DEVICE_CONFIG) public static String getProperty(String namespace, String name) { ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver(); |