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

Commit cc4f7206 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add missing privapp permission allowlist entries." into sc-dev am: b6cc8b1f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97526d16df4a7b6ae0d9b6bf8ae4eeac8628e7fe
parents 255e0173 b6cc8b1f

data/etc/car/com.android.car.provision.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<permissions>

    <privapp-permissions package="com.android.car.provision">

        <permission name="android.car.permission.CAR_POWERTRAIN"/>

        <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>

        <permission name="android.permission.MANAGE_USERS"/>

data/etc/com.android.emergency.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
        <!-- Required to place emergency calls from emergency info screen. -->

        <permission name="android.permission.CALL_PRIVILEGED"/>

        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>

        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>

    </privapp-permissions>

</permissions>

data/etc/com.android.settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -58,5 +58,6 @@ 
        <permission name="android.permission.INSTALL_DYNAMIC_SYSTEM"/>

        <permission name="android.permission.READ_DREAM_STATE"/>

        <permission name="android.permission.READ_DREAM_SUPPRESSION"/>

        <permission name="android.permission.RESTART_WIFI_SUBSYSTEM"/>

    </privapp-permissions>

</permissions>

data/etc/com.android.provision.xml

+1 −1

File changed.

Contains only whitespace changes.