commit 43ccbd66de98bcd0322b949b267e5548e2493d46
author Agatha Man <agathaman@google.com> Tue Nov 17 23:48:21 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 17 23:48:21 2020 +0000
tree a821664f5138304413a9b5744d35be02b49d80aa
parent c1f9c838dcae103092bcf181d6be3409131d55fa
parent ecda24f4dbaf4596ac9fc22f58f9b78debb18b51

Merge "Revert "Add permissions CAR_CONTROL_AUDIO_SETTINGS and MEDIA_CON..."" into rvc-qpr-dev

packages/CarShell/AndroidManifest.xml

diff --git a/packages/CarShell/AndroidManifest.xml b/packages/CarShell/AndroidManifest.xml
index 39bedc1..51815a4 100644
--- a/packages/CarShell/AndroidManifest.xml
+++ b/packages/CarShell/AndroidManifest.xml
@@ -27,10 +27,6 @@
     <uses-permission android:name="android.car.permission.CAR_DRIVING_STATE" />
     <!-- Permission required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases -->
     <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" />
-    <!-- Permission required for ATS tests - AtsCarTests#CarAudioManagerSystemTest -->
-    <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS" />
-    <!-- Permission required for ATS tests - AtsCarTests#CarAudioManagerSystemTest -->
-    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
     <!-- Permissions required for ATS tests - AtsDeviceInfo -->
     <uses-permission android:name="android.car.permission.CAR_DIAGNOSTICS" />
 </manifest>