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

Commit 443decbb authored by Agatha Man's avatar Agatha Man Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I559c3cd33280083f88f4d9f7f2324153e49527ce
parents 2e1b08ef d029933a

data/etc/privapp-permissions-platform.xml

+0 −12
Original line number Diff line number Diff line
@@ -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">

packages/Shell/AndroidManifest.xml

+0 −13
Original line number Diff line number Diff line
@@ -320,19 +320,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"