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

[DO NOT MERGE] Disallow guest user from changing Wifi settings

Browse Source 
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
This commit is contained in:
Samuel Tan
2016-03-14 15:57:02 -07:00
parent eec587edf1
commit d385a6d95f
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,6 +255,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
@@ -468,6 +481,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);
writeUserListLocked();
}