Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add CAR_DIAGNOSTICS, CLEAR_CAR_DIAGNOSTICS, CONTROL_APP_BLOCKING, and CAR_UX_RESTRICTIONS_CONFIGURATION permissions to run ATS tests" into rvc-qpr-dev

Browse Source
This commit is contained in:
Agatha Man
2020-07-27 21:09:41 +00:00
committed by Android (Google) Code Review
parent 0d1cb2835b 5c17bba24d
commit 77d8407cb0
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/etc/privapp-permissions-platform.xml
View File

@@ -434,6 +434,14 @@ applications that come with the platform
<permission name="android.car.permission.CAR_DRIVING_STATE" /> <permission name="android.car.permission.CAR_DRIVING_STATE" />
<!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases --> <!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases -->
<permission name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" /> <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>
<privapp-permissions package="com.android.statementservice"> <privapp-permissions package="com.android.statementservice">

8
packages/Shell/AndroidManifest.xml
View File

@@ -321,6 +321,14 @@
<uses-permission android:name="android.car.permission.CAR_DRIVING_STATE" /> <uses-permission android:name="android.car.permission.CAR_DRIVING_STATE" />
<!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases --> <!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases -->
<uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" /> <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" <application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight" android:theme="@android:style/Theme.DeviceDefault.DayNight"