summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-01-30 02:52:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-30 02:52:14 +0000
commit71375c86d8d379efc7fad277e6e4c45cabeb64dd (patch)
tree7fe41e43d94c20b3ea7e9b3cb53a5127153f197c
parent12824746c7d59c484aa59d63d8186389b7cbbc00 (diff)
parent7ebd13827023a7ad040f74b26b4e0d4861d97107 (diff)
Merge "add shell user permissions for Asistant GTS tests" am: 193dfa0a19 am: 7ebd138270
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546877 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id05953c7bdb08255d248b5f755d262dfa8098af5
-rw-r--r--data/etc/privapp-permissions-platform.xml3
-rw-r--r--packages/Shell/AndroidManifest.xml7
2 files changed, 10 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 149a42303225..f986f1550a72 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -445,6 +445,9 @@ applications that come with the platform
<!-- Permission needed for CTS test - WifiManagerTest -->
<permission name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" />
<permission name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" />
+ <!-- Permission required for GTS test - GtsAssistIntentTestCases -->
+ <permission name="android.permission.MANAGE_SOUND_TRIGGER" />
+ <permission name="android.permission.CAPTURE_AUDIO_HOTWORD" />
</privapp-permissions>
<privapp-permissions package="com.android.statementservice">
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index e222b3bf7921..135356c864ec 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -349,6 +349,13 @@
<!-- Permission required for CTS test - CtsSensorPrivacyTestCases -->
<uses-permission android:name="android.permission.MANAGE_SENSOR_PRIVACY" />
+ <!-- Permission required for GTS test - GtsAssistIntentTestCases -->
+ <uses-permission android:name="android.permission.MANAGE_SOUND_TRIGGER" />
+ <uses-permission android:name="android.permission.CAPTURE_AUDIO_HOTWORD" />
+ <uses-permission android:name="android.permission.BIND_VOICE_INTERACTION" />
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
+
<application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true"