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

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

Merge "Correct permission used for user related user restrictions." into... 

Merge "Correct permission used for user related user restrictions." into udc-dev am: 396f8c52 am: e817f994

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



Change-Id: Ia74ffe719c8fa71d231ab294e3b68be97ffdc0b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1dd836a4 e817f994

core/java/android/os/UserManager.java

+4 −4
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ public class UserManager { 
     * The default value is <code>false</code>.

     *

     * <p>Holders of the permission

     * {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_USERS}

     * {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MODIFY_USERS}

     * can set this restriction using the DevicePolicyManager APIs mentioned below.

     *

     * <p>Key for user restrictions.
@@ -947,7 +947,7 @@ public class UserManager { 
     * this restriction will be set as a base restriction which cannot be removed by any admin.

     *

     * <p>Holders of the permission

     * {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_USERS}

     * {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MODIFY_USERS}

     * can set this restriction using the DevicePolicyManager APIs mentioned below.

     *

     * <p>Key for user restrictions.
@@ -1457,7 +1457,7 @@ public class UserManager { 
     * affected. The default value is <code>false</code>.

     *

     * <p>Holders of the permission

     * {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_USERS}

     * {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MODIFY_USERS}

     * can set this restriction using the DevicePolicyManager APIs mentioned below.

     *

     * <p>Key for user restrictions.
@@ -1603,7 +1603,7 @@ public class UserManager { 
     * set.

     *

     * <p>Holders of the permission

     * {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_USERS}

     * {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MODIFY_USERS}

     * can set this restriction using the DevicePolicyManager APIs mentioned below.

     *

     * <p>The default value is <code>false</code>.

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+10 −10
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import static android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS; 
import static android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_TASK;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_MICROPHONE;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_MOBILE_NETWORK;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_MODIFY_USERS;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_MTE;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY;
@@ -73,7 +74,6 @@ import static android.Manifest.permission.MANAGE_DEVICE_POLICY_SYSTEM_UPDATES; 
import static android.Manifest.permission.MANAGE_DEVICE_POLICY_TIME;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_USERS;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_VPN;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_WALLPAPER;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_WIFI;
@@ -13725,7 +13725,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_ADD_CLONE_PROFILE, new String[]{MANAGE_DEVICE_POLICY_PROFILES});

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_ADD_USER, new String[]{MANAGE_DEVICE_POLICY_USERS});

                UserManager.DISALLOW_ADD_USER, new String[]{MANAGE_DEVICE_POLICY_MODIFY_USERS});

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_ADD_WIFI_CONFIG, new String[]{MANAGE_DEVICE_POLICY_WIFI});

        USER_RESTRICTION_PERMISSIONS.put(
@@ -13815,13 +13815,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_PRINTING, new String[]{MANAGE_DEVICE_POLICY_PRINTING});

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_REMOVE_USER, new String[]{MANAGE_DEVICE_POLICY_USERS});

                UserManager.DISALLOW_REMOVE_USER, new String[]{MANAGE_DEVICE_POLICY_MODIFY_USERS});

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_RUN_IN_BACKGROUND, new String[]{MANAGE_DEVICE_POLICY_RUN_IN_BACKGROUND});

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_SAFE_BOOT, new String[]{MANAGE_DEVICE_POLICY_SAFE_BOOT});

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_SET_USER_ICON, new String[]{MANAGE_DEVICE_POLICY_USERS});

                UserManager.DISALLOW_SET_USER_ICON, new String[]{MANAGE_DEVICE_POLICY_MODIFY_USERS});

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_SET_WALLPAPER, new String[]{MANAGE_DEVICE_POLICY_WALLPAPER});

        USER_RESTRICTION_PERMISSIONS.put(
@@ -13847,7 +13847,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_USB_FILE_TRANSFER, new String[]{MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER});

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_USER_SWITCH, new String[]{MANAGE_DEVICE_POLICY_USERS});

                UserManager.DISALLOW_USER_SWITCH, new String[]{MANAGE_DEVICE_POLICY_MODIFY_USERS});

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_WIFI_DIRECT, new String[]{MANAGE_DEVICE_POLICY_WIFI});

        USER_RESTRICTION_PERMISSIONS.put(
@@ -23036,6 +23036,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            MANAGE_DEVICE_POLICY_LOCK_TASK,

            MANAGE_DEVICE_POLICY_MICROPHONE,

            MANAGE_DEVICE_POLICY_MOBILE_NETWORK,

            MANAGE_DEVICE_POLICY_MODIFY_USERS,

            MANAGE_DEVICE_POLICY_MTE,

            MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION,

            MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY,
@@ -23059,7 +23060,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            MANAGE_DEVICE_POLICY_TIME,

            MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING,

            MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER,

            MANAGE_DEVICE_POLICY_USERS,

            MANAGE_DEVICE_POLICY_VPN,

            MANAGE_DEVICE_POLICY_WALLPAPER,

            MANAGE_DEVICE_POLICY_WIFI,
@@ -23080,12 +23080,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            MANAGE_DEVICE_POLICY_KEYGUARD,

            MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS,

            MANAGE_DEVICE_POLICY_LOCK_TASK,

            MANAGE_DEVICE_POLICY_MODIFY_USERS,

            MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY,

            MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS,

            MANAGE_DEVICE_POLICY_SAFE_BOOT,

            MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE,

            MANAGE_DEVICE_POLICY_TIME,

            MANAGE_DEVICE_POLICY_USERS,

            MANAGE_DEVICE_POLICY_WIPE_DATA

    );










@@ -23171,6 +23171,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                    MANAGE_DEVICE_POLICY_FUN,















                    MANAGE_DEVICE_POLICY_LOCK_TASK,















                    MANAGE_DEVICE_POLICY_MOBILE_NETWORK,













                    MANAGE_DEVICE_POLICY_MODIFY_USERS,















                    MANAGE_DEVICE_POLICY_PHYSICAL_MEDIA,















                    MANAGE_DEVICE_POLICY_PRINTING,















                    MANAGE_DEVICE_POLICY_PROFILES,









@@ -23179,7 +23180,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                    MANAGE_DEVICE_POLICY_SMS,















                    MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS,















                    MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER,













                    MANAGE_DEVICE_POLICY_USERS,















                    MANAGE_DEVICE_POLICY_WINDOWS,















                    SET_TIME,















                    SET_TIME_ZONE










@@ -23369,6 +23369,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);















        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK_TASK,















                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);













        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MODIFY_USERS,













                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);















        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MICROPHONE_TOGGLE,















                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);















        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY,









@@ -23389,8 +23391,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);















        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS,















                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);













        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_USERS,













                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);















        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_VPN,















                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);















        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_WALLPAPER,