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

Merge "Don't allow creating a guest from a secondary user..." into lmp-dev

Browse Source
This commit is contained in:
Amith Yamasani
2014-09-17 20:06:59 +00:00
committed by Android (Google) Code Review
parent ae9d437b4a f5d14b2aed
commit 69b674656a
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; return;
} }
} }
// No guest user. Create one. // No guest user. Create one, if there's no restriction.
if (mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) { // 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"); Log.i(TAG, "Blocking guest creation because it is restricted");
return; return;
} }