Merge "Fetch DISALLOW_CONFIG_VPN for the current user." into mnc-dev (2665fdfd) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/Vpn.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -488,7 +488,8 @@ public class Vpn {
		try {
		// Restricted users are not allowed to create VPNs, they are tied to Owner
		UserInfo user = mgr.getUserInfo(mUserHandle);
		if (user.isRestricted() \|\| mgr.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
		if (user.isRestricted() \|\| mgr.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN,
		new UserHandle(mUserHandle))) {
		throw new SecurityException("Restricted users cannot establish VPNs");
		}

		@@ -896,7 +897,8 @@ public class Vpn {
		}
		UserManager mgr = UserManager.get(mContext);
		UserInfo user = mgr.getUserInfo(mUserHandle);
		if (user.isRestricted() \|\| mgr.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
		if (user.isRestricted() \|\| mgr.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN,
		new UserHandle(mUserHandle))) {
		throw new SecurityException("Restricted users cannot establish VPNs");
		}