Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disallow guest user from changing Wifi settings" into nyc-dev

Browse Source
This commit is contained in:
Samuel Tan
2016-03-21 17:58:38 +00:00
committed by Android (Google) Code Review
parent aaa725647e d9453b8ba1
commit 07ece5936d
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -387,6 +387,15 @@ public class UserManagerService extends IUserManager.Stub {
synchronized (mRestrictionsLock) { synchronized (mRestrictionsLock) {
applyUserRestrictionsLR(UserHandle.USER_SYSTEM); applyUserRestrictionsLR(UserHandle.USER_SYSTEM);
} }
UserInfo currentGuestUser = findCurrentGuestUser();
if (currentGuestUser != null && !hasUserRestriction(
UserManager.DISALLOW_CONFIG_WIFI, currentGuestUser.id)) {
// If a guest user currently exists, apply the DISALLOW_CONFIG_WIFI option
// to it, in case this guest was created in a previous version where this
// user restriction was not a default guest restriction.
setUserRestriction(UserManager.DISALLOW_CONFIG_WIFI, true, currentGuestUser.id);
}
} }
@Override @Override
@@ -828,6 +837,7 @@ public class UserManagerService extends IUserManager.Stub {
private void initDefaultGuestRestrictions() { private void initDefaultGuestRestrictions() {
synchronized (mGuestRestrictions) { synchronized (mGuestRestrictions) {
if (mGuestRestrictions.isEmpty()) { if (mGuestRestrictions.isEmpty()) {
mGuestRestrictions.putBoolean(UserManager.DISALLOW_CONFIG_WIFI, true);
mGuestRestrictions.putBoolean(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true);
mGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, true);
mGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true);