Merge "Remove car permissions from common shell package" into rvc-qpr-dev

This commit is contained in:
Agatha Man
2020-08-14 18:44:47 +00:00
committed by Android (Google) Code Review
2 changed files with 0 additions and 25 deletions

View File

@@ -431,18 +431,6 @@ applications that come with the platform
<permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
<!-- Permissions required for CTS test - AdbManagerTest -->
<permission name="android.permission.MANAGE_DEBUGGING" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases, AtsCarDeviceApp -->
<permission name="android.car.permission.CAR_DRIVING_STATE" />
<!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases -->
<permission name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" />
<!-- Permissions required for ATS tests - AtsDeviceInfo -->
<permission name="android.car.permission.CAR_DIAGNOSTICS" />
<!-- Permissions required for ATS tests - AtsDeviceInfo -->
<permission name="android.car.permission.CLEAR_CAR_DIAGNOSTICS" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases -->
<permission name="android.car.permission.CONTROL_APP_BLOCKING" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases -->
<permission name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION" />
</privapp-permissions>
<privapp-permissions package="com.android.statementservice">

View File

@@ -317,19 +317,6 @@
<!-- Permissions required for CTS test - AdbManagerTest -->
<uses-permission android:name="android.permission.MANAGE_DEBUGGING" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases, AtsCarDeviceApp -->
<uses-permission android:name="android.car.permission.CAR_DRIVING_STATE" />
<!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases -->
<uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" />
<!-- Permissions required for ATS tests - AtsDeviceInfo -->
<uses-permission android:name="android.car.permission.CAR_DIAGNOSTICS" />
<!-- Permissions required for ATS tests - AtsDeviceInfo -->
<uses-permission android:name="android.car.permission.CLEAR_CAR_DIAGNOSTICS" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases -->
<uses-permission android:name="android.car.permission.CONTROL_APP_BLOCKING" />
<!-- Permissions required for ATS tests - AtsCarHostTestCases -->
<uses-permission android:name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION" />
<application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true"