Merge "Make base user restrictions queriable for system apps" (ed6c8cd6) · Commits · e / os / android_frameworks_base

core/java/android/os/IUserManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ interface IUserManager {
		int getUserSerialNumber(int userHandle);
		int getUserHandle(int userSerialNumber);
		Bundle getUserRestrictions(int userHandle);
		boolean hasBaseUserRestriction(String restrictionKey, int userHandle);
		boolean hasUserRestriction(in String restrictionKey, int userHandle);
		void setUserRestriction(String key, boolean value, int userId);
		void setApplicationRestrictions(in String packageName, in Bundle restrictions,

+18 −0

Original line number	Diff line number	Diff line
		@@ -826,6 +826,24 @@ public class UserManager {
		}
		}

		/**
		* @hide
		* Returns whether the given user has been disallowed from performing certain actions
		* or setting certain settings through UserManager. This method disregards restrictions
		* set by device policy.
		* @param restrictionKey the string key representing the restriction
		* @param userHandle the UserHandle of the user for whom to retrieve the restrictions.
		*/
		public boolean hasBaseUserRestriction(String restrictionKey, UserHandle userHandle) {
		try {
		return mService.hasBaseUserRestriction(restrictionKey, userHandle.getIdentifier());
		} catch (RemoteException re) {
		Log.w(TAG, "Could not get base user restrictions for user " +
		userHandle.getIdentifier(), re);
		return false;
		}
		}

		/**
		* This will no longer work. Device owners and profile owners should use
		* {@link DevicePolicyManager#addUserRestriction(ComponentName, String)} instead.

+9 −0

Original line number	Diff line number	Diff line
		@@ -844,6 +844,15 @@ public class UserManagerService extends IUserManager.Stub {
		return UserRestrictionsUtils.clone(getEffectiveUserRestrictions(userId));
		}

		@Override
		public boolean hasBaseUserRestriction(String restrictionKey, int userId) {
		checkManageUsersPermission("hasBaseUserRestriction");
		synchronized (mRestrictionsLock) {
		Bundle bundle = mBaseUserRestrictions.get(userId);
		return (bundle != null && bundle.getBoolean(restrictionKey, false));
		}
		}

		@Override
		public void setUserRestriction(String key, boolean value, int userId) {
		checkManageUsersPermission("setUserRestriction");