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:47:51 -0700 |
commit | 12332e05f632794e18ea8c4ac52c98e82532e5db (patch) | |
tree | edb1a4b43a464a66a7f6af7c2524f775e189b979 | |
parent | 3cd1905d857913241198f65066e1aa78516192ea (diff) | |
download | base-android-6.0.1_r41.tar.gz |
[DO NOT MERGE] Disallow guest user from changing Wifi settingsandroid-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40
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 | 12 |
1 files changed, 12 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 06c3682fa988..fd9979f1c552 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -262,6 +262,17 @@ 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. + setUserRestriction(UserManager.DISALLOW_CONFIG_WIFI, true, currentGuestUser.id); + } } @Override @@ -509,6 +520,7 @@ public class UserManagerService extends IUserManager.Stub { if (mGuestRestrictions.isEmpty()) { mGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true); + mGuestRestrictions.putBoolean(UserManager.DISALLOW_CONFIG_WIFI, true); } } |