diff options
author | Samuel Tan <samueltan@google.com> | 2016-03-14 15:57:02 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2016-03-25 17:09:12 -0700 |
commit | 1f2c42803357f71ab6c41ddf1178f57924a326cd (patch) | |
tree | 759d9a7591e6935cee6f0657dd4fa3e8ee213762 | |
parent | d3383d5bfab296ba3adbc121ff8a7b542bde4afb (diff) | |
download | base-1f2c42803357f71ab6c41ddf1178f57924a326cd.tar.gz |
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Disallow existing and newly created guest users from
changing Wifi settings.
BUG: 27411179
TEST: Flashed device, switched to existing guest user, and verified
that Wifi settings are disabled.
TEST: Flashed device, created new guest user, and verified that Wifi
settings are disabled.
Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3
-rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index d484b8f99c23..41eacc2359b3 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -256,6 +256,19 @@ public class UserManagerService extends IUserManager.Stub { Log.w(LOG_TAG, "Unable to notify AppOpsService of UserRestrictions"); } } + UserInfo currentGuestUser = null; + synchronized (mPackagesLock) { + currentGuestUser = findCurrentGuestUserLocked(); + } + 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. + Bundle userRestrictionsToSet = new Bundle(); + userRestrictionsToSet.putBoolean(UserManager.DISALLOW_CONFIG_WIFI, true); + setUserRestrictions(userRestrictionsToSet, currentGuestUser.id); + } } @Override @@ -472,6 +485,7 @@ public class UserManagerService extends IUserManager.Stub { */ private void initDefaultGuestRestrictions() { if (mGuestRestrictions.isEmpty()) { + mGuestRestrictions.putBoolean(UserManager.DISALLOW_CONFIG_WIFI, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true); } |