From 6ffbb9568c09e77bd934a03f5b0fbc21d520ce1a Mon Sep 17 00:00:00 2001
From: Hyundo Moon <hdmoon@google.com>
Date: Thu, 15 Apr 2021 17:20:30 +0900
Subject: [PATCH] Change MODIFY_AUDIO_ROUTING permission to
 MEDIA_CONTENT_CONTROL

As changing the permission for MediaRouter2 system APIs, this CL
changes the permission in shell accordingly.

The permission was added by ag/13959439.

Bug: 183428114
Test: Passed CTS tests
Change-Id: I3aee256a11db730dd786e69821f3bb8bd590074f
---
 data/etc/privapp-permissions-platform.xml | 2 +-
 packages/Shell/AndroidManifest.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 2fe8b285ed888..8108eb91188bd 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -503,7 +503,7 @@ applications that come with the platform
         <!-- 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"/>
+        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
         <!-- Permission required for CTS test - CtsPermission5TestCases -->
         <permission name="android.permission.RENOUNCE_PERMISSIONS" />
         <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" />
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index bef6423f3baa1..9c2e8c97f1f40 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -534,7 +534,7 @@
     <uses-permission android:name="android.permission.SCHEDULE_PRIORITIZED_ALARM" />
 
     <!-- Permission required for CTS test - SystemMediaRouter2Test -->
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" />
+    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
 
     <!-- Permission required for CTS test - CtsRotationResolverServiceDeviceTestCases -->
     <uses-permission android:name="android.permission.MANAGE_ROTATION_RESOLVER" />