summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-04-01 17:05:29 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-04-01 17:05:29 +0000
commit34cfcb8226e5462050f15c85839c0bbbf440bbe4 (patch)
tree8f5c32ff21741e4c2b9807c6854b2a91d5c866c9
parent8b5679d5341b47b03996b6dec32461cf5e275d6f (diff)
parent9ebc56d6dd0917e3411982e2036cecb35b8b49d1 (diff)
Merge "Add MODIFY_AUDIO_ROUTING permission to shell for CTS test." into sc-dev
-rw-r--r--data/etc/privapp-permissions-platform.xml2
-rw-r--r--packages/Shell/AndroidManifest.xml3
2 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 1eecca5baa2c..8312320a8d87 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -499,6 +499,8 @@ applications that come with the platform
<permission name="android.permission.REGISTER_MEDIA_RESOURCE_OBSERVER" />
<!-- Permission required for CTS test - CtsAlarmManagerTestCases -->
<permission name="android.permission.SCHEDULE_PRIORITIZED_ALARM" />
+ <!-- Permission required for CTS test - SystemMediaRouter2Test -->
+ <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
</privapp-permissions>
<privapp-permissions package="com.android.statementservice">
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 47510957cb4d..6cf2bb683517 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -455,6 +455,9 @@
<!-- Permission required for CTS test - CtsAlarmManagerTestCases -->
<uses-permission android:name="android.permission.SCHEDULE_PRIORITIZED_ALARM" />
+ <!-- Permission required for CTS test - SystemMediaRouter2Test -->
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" />
+
<application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true"