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

Commit b223f73a authored by Emily Bernier's avatar Emily Bernier
Browse files

Add user restrictions (credentials, user removal) 

Created constants in current.txt and UserManager.java, modified restrictions access in UserManagerService.java.

Change-Id: If8d778d84af81dcbf5784f6e0afd9ef966cc8ecf
parent 873a39cd

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -17080,6 +17080,9 @@ package android.os { 
    field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location";

    field public static final java.lang.String DISALLOW_UNINSTALL_APPS = "no_uninstall_apps";

    field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";

    field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";

    field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user";















  }





























  public abstract class Vibrator {

























core/java/android/os/UserManager.java



+20
−1




























Original line number
Diff line number
Diff line








@@ -110,7 +110,6 @@ public class UserManager {













     */















    public static final String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";













































    /**















     * Key for user restrictions. Specifies if a user is disallowed from transferring files over















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









@@ -121,6 +120,26 @@ public class UserManager {













     */















    public static final String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";





























    /**













     * Key for user restrictions. Specifies if a user is disallowed from configuring user













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













     * <p/>













     * Type: Boolean













     * @see #setUserRestrictions(Bundle)













     * @see #getUserRestrictions()













     */













    public static final String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";



























    /**













     * Key for user restrictions. Specifies if a user is disallowed from removing users.













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













     * <p/>













     * Type: Boolean













     * @see #setUserRestrictions(Bundle)













     * @see #getUserRestrictions()













     */













    public static final String DISALLOW_REMOVE_USER = "no_remove_user";





























    private static UserManager sInstance = null;































    public synchronized static UserManager get(Context context) {

































services/java/com/android/server/pm/UserManagerService.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -622,6 +622,8 @@ public class UserManagerService extends IUserManager.Stub {













                        UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);















                writeBoolean(serializer, restrictions, UserManager.DISALLOW_CONFIG_BLUETOOTH);















                writeBoolean(serializer, restrictions, UserManager.DISALLOW_USB_FILE_TRANSFER);













                writeBoolean(serializer, restrictions, UserManager.DISALLOW_CONFIG_CREDENTIALS);













                writeBoolean(serializer, restrictions, UserManager.DISALLOW_REMOVE_USER);















                serializer.endTag(null, TAG_RESTRICTIONS);















            }















            serializer.endTag(null, TAG_USER);










@@ -742,6 +744,8 @@ public class UserManagerService extends IUserManager.Stub {













                                UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);















                        readBoolean(parser, restrictions, UserManager.DISALLOW_CONFIG_BLUETOOTH);















                        readBoolean(parser, restrictions, UserManager.DISALLOW_USB_FILE_TRANSFER);













                        readBoolean(parser, restrictions, UserManager.DISALLOW_CONFIG_CREDENTIALS);













                        readBoolean(parser, restrictions, UserManager.DISALLOW_REMOVE_USER);















                    }















                }















            }