User restriction API to disable single-user restrictions feature. (0343ec3a) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -18027,6 +18027,7 @@ package android.os {
		method public void setUserRestriction(java.lang.String, boolean);
		method public void setUserRestrictions(android.os.Bundle);
		method public void setUserRestrictions(android.os.Bundle, android.os.UserHandle);
		field public static final java.lang.String DISALLOW_APP_RESTRICTIONS = "no_app_restrictions";
		field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";
		field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";
		field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi";

core/java/android/os/UserManager.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,16 @@ public class UserManager {
		*/
		public static final String DISALLOW_REMOVE_USER = "no_remove_user";

		/**
		* Key for user restrictions. Specifies if a user is disallowed from setting app restrictions
		* via a restrictions PIN. The default is <code>false</code>. If app restrictions have already
		* been set up, then this user restriction cannot be set to true.
		* <p/>
		* Type: Boolean
		* @see #hasRestrictionsPin()
		*/
		public static final String DISALLOW_APP_RESTRICTIONS = "no_app_restrictions";

		/** @hide */
		public static final int PIN_VERIFICATION_FAILED_INCORRECT = -3;
		/** @hide */

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

+17 −4

Original line number	Diff line number	Diff line
		@@ -416,8 +416,15 @@ public class UserManagerService extends IUserManager.Stub {
		@Override
		public void setUserRestrictions(Bundle restrictions, int userId) {
		checkManageUsersPermission("setUserRestrictions");
		if (restrictions == null) return;

		synchronized (mPackagesLock) {
		// If the user has restrictions already and call is trying to disallow restrictions,
		// don't modify the flag.
		if (hasRestrictionsPinLocked(userId)
		&& restrictions.getBoolean(UserManager.DISALLOW_APP_RESTRICTIONS, false)) {
		restrictions.putBoolean(UserManager.DISALLOW_APP_RESTRICTIONS, false);
		}
		mUserRestrictions.get(userId).putAll(restrictions);
		writeUserLocked(mUsers.get(userId));
		}
		@@ -681,6 +688,7 @@ public class UserManagerService extends IUserManager.Stub {
		writeBoolean(serializer, restrictions, UserManager.DISALLOW_USB_FILE_TRANSFER);
		writeBoolean(serializer, restrictions, UserManager.DISALLOW_CONFIG_CREDENTIALS);
		writeBoolean(serializer, restrictions, UserManager.DISALLOW_REMOVE_USER);
		writeBoolean(serializer, restrictions, UserManager.DISALLOW_APP_RESTRICTIONS);
		serializer.endTag(null, TAG_RESTRICTIONS);
		}
		serializer.endTag(null, TAG_USER);
		@@ -811,6 +819,7 @@ public class UserManagerService extends IUserManager.Stub {
		readBoolean(parser, restrictions, UserManager.DISALLOW_USB_FILE_TRANSFER);
		readBoolean(parser, restrictions, UserManager.DISALLOW_CONFIG_CREDENTIALS);
		readBoolean(parser, restrictions, UserManager.DISALLOW_REMOVE_USER);
		readBoolean(parser, restrictions, UserManager.DISALLOW_APP_RESTRICTIONS);
		}
		}
		}
		@@ -1196,11 +1205,15 @@ public class UserManagerService extends IUserManager.Stub {
		public boolean hasRestrictionsPin() {
		int userId = UserHandle.getCallingUserId();
		synchronized (mPackagesLock) {
		return hasRestrictionsPinLocked(userId);
		}
		}

		private boolean hasRestrictionsPinLocked(int userId) {
		RestrictionsPinState pinState = mRestrictionsPinStates.get(userId);
		if (pinState == null \|\| pinState.salt == 0 \|\| pinState.pinHash == null) {
		return false;
		}
		}
		return true;
		}