Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev (ce70311b) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -17089,6 +17089,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 {

+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) {

+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);
		}
		}
		}