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

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

Browse Source 
* commit '80a1ced5b22a24e472c4c465c8fcb8dca7a74da8':
  Don't allow creating a guest from a secondary user...
This commit is contained in:
Amith Yamasani
2014-09-17 20:27:03 +00:00
committed by Android Git Automerger
parent 7dfc3540a3 80a1ced5b2
commit c7ab2db7df
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;
}