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

Commit ddb7e262 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Add new permission UPDATE_DEVICE_MANAGEMENT_RESOURCES"

parents f54d7bdb 3809e3ee

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ package android { 
    field public static final String TV_VIRTUAL_REMOTE_CONTROLLER = "android.permission.TV_VIRTUAL_REMOTE_CONTROLLER";

    field public static final String UNLIMITED_SHORTCUTS_API_CALLS = "android.permission.UNLIMITED_SHORTCUTS_API_CALLS";

    field public static final String UPDATE_APP_OPS_STATS = "android.permission.UPDATE_APP_OPS_STATS";

    field public static final String UPDATE_DEVICE_MANAGEMENT_RESOURCES = "android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES";

    field public static final String UPDATE_DOMAIN_VERIFICATION_USER_SELECTION = "android.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION";

    field public static final String UPDATE_FONTS = "android.permission.UPDATE_FONTS";

    field public static final String UPDATE_LOCK = "android.permission.UPDATE_LOCK";

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -6065,6 +6065,12 @@ 
    <permission android:name="android.permission.LAUNCH_DEVICE_MANAGER_SETUP"

        android:protectionLevel="signature|role" />



    <!-- @SystemApi Allows an application to update certain device management related system

         resources.

         @hide -->

    <permission android:name="android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES"

                android:protectionLevel="signature|role" />

    

    <!-- Attribution for Geofencing service. -->

    <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>

    <!-- Attribution for Country Detector. -->

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ 
    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />

    <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" />

    <uses-permission android:name="android.permission.QUERY_ADMIN_POLICY" />

    <uses-permission android:name="android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES" />

    <uses-permission android:name="android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS" />

    <uses-permission android:name="android.permission.CLEAR_FREEZE_PERIOD" />

    <uses-permission android:name="android.permission.MODIFY_QUIET_MODE" />