summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ajay Gopi <ajaygopi@google.com> 2023-11-16 20:33:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-11-16 20:33:37 +0000
commitfa492c0d549fb930b05f3c748f250c2ff83d9e2c (patch)
tree457e6b73f6480e0213210a635b64983bf0f48e19
parentcd1d115ef5503748182b6aebec8c90a5533ad513 (diff)
parentc32fa5f33e7d145a745b13a4c9799a08707a3550 (diff)
Merge "Add android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO in Shell manifest." into main
-rw-r--r--data/etc/privapp-permissions-platform.xml1
-rw-r--r--packages/Shell/AndroidManifest.xml2
2 files changed, 3 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 3218666771df..1f08955e5f58 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -467,6 +467,7 @@ applications that come with the platform
<permission name="android.permission.BIND_HOTWORD_DETECTION_SERVICE" />
<permission name="android.permission.BIND_VISUAL_QUERY_DETECTION_SERVICE" />
<permission name="android.permission.MANAGE_APP_HIBERNATION"/>
+ <permission name="android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO" />
<!-- Permission required for CTS test - ResourceObserverNativeTest -->
<permission name="android.permission.REGISTER_MEDIA_RESOURCE_OBSERVER" />
<!-- Permission required for CTS test - MediaCodecResourceTest -->
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index cb81551cf253..650319fd58f9 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -869,6 +869,8 @@
<!-- Permissions required for CTS test - CtsVoiceInteractionTestCases -->
<uses-permission android:name="android.permission.RESET_HOTWORD_TRAINING_DATA_EGRESS_COUNT" />
<uses-permission android:name="android.permission.RECEIVE_SANDBOXED_DETECTION_TRAINING_DATA" />
+ <uses-permission android:name="android.permission.RECEIVE_SANDBOX_TRIGGER_AUDIO" />
+
<uses-permission android:name="android.permission.GET_BINDING_UID_IMPORTANCE" />
<application