Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 021baba4 authored by Agatha Man's avatar Agatha Man Committed by Automerger Merge Worker
Browse files

Merge "Add CAR_DIAGNOSTICS, CLEAR_CAR_DIAGNOSTICS, CONTROL_APP_BLOCKING, and... 

Merge "Add CAR_DIAGNOSTICS, CLEAR_CAR_DIAGNOSTICS, CONTROL_APP_BLOCKING, and CAR_UX_RESTRICTIONS_CONFIGURATION permissions to run ATS tests" into rvc-qpr-dev am: 77d8407c am: 95fa0c3f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12225177

Change-Id: I2dfd6398ea992ea9ebce203efc45ae1693711a6a
parents c7b76d64 95fa0c3f

data/etc/privapp-permissions-platform.xml

+8 −0
Original line number Diff line number Diff line
@@ -436,6 +436,14 @@ applications that come with the platform 
        <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">

packages/Shell/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -324,6 +324,14 @@ 
    <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"