summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-01-21 14:38:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-01-21 14:38:15 +0000
commit697cba5e5c8f8730b2b8a4001ec04e65cf9e89ed (patch)
tree1bfa301e07728645b75df8088f3d9e02b6c8d37b /core
parenteadc950b1e57c4af69bfd9f753d4b9e463b3667b (diff)
parent4e251482e13e209af686660726b870abfe3e114c (diff)
Merge "Define two new permissions to guard role-based access to AppSearch."
Diffstat (limited to 'core')
-rw-r--r--core/api/current.txt2
-rw-r--r--core/res/AndroidManifest.xml12
2 files changed, 13 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 8d655d9349ac..18b956ba57ab 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -125,11 +125,13 @@ package android {
field public static final String POST_NOTIFICATIONS = "android.permission.POST_NOTIFICATIONS";
field @Deprecated public static final String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
field public static final String QUERY_ALL_PACKAGES = "android.permission.QUERY_ALL_PACKAGES";
+ field public static final String READ_ASSISTANT_APP_SEARCH_DATA = "android.permission.READ_ASSISTANT_APP_SEARCH_DATA";
field public static final String READ_BASIC_PHONE_STATE = "android.permission.READ_BASIC_PHONE_STATE";
field public static final String READ_CALENDAR = "android.permission.READ_CALENDAR";
field public static final String READ_CALL_LOG = "android.permission.READ_CALL_LOG";
field public static final String READ_CONTACTS = "android.permission.READ_CONTACTS";
field public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE";
+ field public static final String READ_HOME_APP_SEARCH_DATA = "android.permission.READ_HOME_APP_SEARCH_DATA";
field @Deprecated public static final String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";
field public static final String READ_LOGS = "android.permission.READ_LOGS";
field public static final String READ_NEARBY_STREAMING_POLICY = "android.permission.READ_NEARBY_STREAMING_POLICY";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index c367e04c16a7..9ed11375c7fe 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -6105,11 +6105,21 @@
<permission android:name="android.permission.CAPTURE_BLACKOUT_CONTENT"
android:protectionLevel="signature" />
- <!-- @SystemApi Allows an application to query over global data in AppSearch.
+ <!-- @SystemApi Allows an application to query over global data in AppSearch.
@hide -->
<permission android:name="android.permission.READ_GLOBAL_APP_SEARCH_DATA"
android:protectionLevel="internal|role" />
+ <!-- Allows an application to query over global data in AppSearch that's visible to the
+ ASSISTANT role. -->
+ <permission android:name="android.permission.READ_ASSISTANT_APP_SEARCH_DATA"
+ android:protectionLevel="internal|role" />
+
+ <!-- Allows an application to query over global data in AppSearch that's visible to the
+ HOME role. -->
+ <permission android:name="android.permission.READ_HOME_APP_SEARCH_DATA"
+ android:protectionLevel="internal|role" />
+
<!-- @SystemApi Allows an application to create virtual devices in VirtualDeviceManager.
@hide -->
<permission android:name="android.permission.CREATE_VIRTUAL_DEVICE"