PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c7ab2db7: am 80a1ced5: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev

Browse Source 
* commit 'c7ab2db7dfd6526318da0ae06384dec8e1d79e25':
  Don't allow creating a guest from a secondary user...
This commit is contained in:
Amith Yamasani
2014-09-17 20:39:13 +00:00
committed by Android Git Automerger
parent 7cd016e3e0 c7ab2db7df
commit befe3c6ff7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/users/UserSettings.java
View File

@@ -920,8 +920,11 @@ public class UserSettings extends SettingsPreferenceFragment
return;
}
}
// No guest user. Create one.
if (mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) {
// No guest user. Create one, if there's no restriction.
// If it is not the primary user, then adding users from lockscreen must be enabled
if (mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)
|| (!mIsOwner && Settings.Global.getInt(getContentResolver(),
Settings.Global.ADD_USERS_WHEN_LOCKED, 0) != 1)) {
Log.i(TAG, "Blocking guest creation because it is restricted");
return;
}