Merge "Restrictions: Clarify "non-Admin" not "secondary"" into main (90a03b7c) · Commits · e / os / android_frameworks_base

core/java/android/os/UserManager.java

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -940,10 +940,10 @@ public class UserManager {

	/**		/**
	* Specifies if a user is disallowed from resetting network settings		* Specifies if a user is disallowed from resetting network settings
	* from Settings. This can only be set by device owners and profile owners on the primary user.		* from Settings. This can only be set by device owners and profile owners on the main user.
	* The default value is <code>false</code>.		* The default value is <code>false</code>.
	* <p>This restriction has no effect on secondary users and managed profiles since only the		* <p>This restriction has no effect on non-Admin users since they cannot reset the network
	* primary user can reset the network settings of the device.		* settings of the device.
	*		*
	* <p>Holders of the permission		* <p>Holders of the permission
	* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MOBILE_NETWORK}		* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MOBILE_NETWORK}
	@@ -1077,11 +1077,11 @@ public class UserManager {
	/**		/**
	* Specifies if a user is disallowed from configuring cell broadcasts.		* Specifies if a user is disallowed from configuring cell broadcasts.
	*		*
	* <p>This restriction can only be set by a device owner, a profile owner on the primary		* <p>This restriction can only be set by a device owner, a profile owner on the main
	* user or a profile owner of an organization-owned managed profile on the parent profile.		* user or a profile owner of an organization-owned managed profile on the parent profile.
	* When it is set by a device owner, it applies globally. When it is set by a profile owner		* When it is set by a device owner, it applies globally. When it is set by a profile owner
	* on the primary user or by a profile owner of an organization-owned managed profile on		* on the main user or by a profile owner of an organization-owned managed profile on
	* the parent profile, it disables the primary user from configuring cell broadcasts.		* the parent profile, it disables the user from configuring cell broadcasts.
	*		*
	* <p>Holders of the permission		* <p>Holders of the permission
	* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MOBILE_NETWORK}		* {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_MOBILE_NETWORK}
	@@ -1089,8 +1089,8 @@ public class UserManager {
	*		*
	* <p>The default value is <code>false</code>.		* <p>The default value is <code>false</code>.
	*		*
	* <p>This restriction has no effect on secondary users and managed profiles since only the		* <p>This restriction has no effect on non-Admin users since they cannot configure cell
	* primary user can configure cell broadcasts.		* broadcasts.
	*		*
	* <p>Key for user restrictions.		* <p>Key for user restrictions.
	* <p>Type: Boolean		* <p>Type: Boolean
	@@ -1103,11 +1103,11 @@ public class UserManager {
	/**		/**
	* Specifies if a user is disallowed from configuring mobile networks.		* Specifies if a user is disallowed from configuring mobile networks.
	*		*
	* <p>This restriction can only be set by a device owner, a profile owner on the primary		* <p>This restriction can only be set by a device owner, a profile owner on the main
	* user or a profile owner of an organization-owned managed profile on the parent profile.		* user or a profile owner of an organization-owned managed profile on the parent profile.
	* When it is set by a device owner, it applies globally. When it is set by a profile owner		* When it is set by a device owner, it applies globally. When it is set by a profile owner
	* on the primary user or by a profile owner of an organization-owned managed profile on		* on the main user or by a profile owner of an organization-owned managed profile on