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

Merge "Allow none lockscreen with multiple users"

Browse Source
This commit is contained in:
Adrian Roos
2015-04-08 15:24:29 +00:00
committed by Android (Google) Code Review
parent 1951726152 591dc85017
commit c2ab934117
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/SecuritySettings.java
View File

@@ -157,12 +157,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
LockPatternUtils lockPatternUtils) {
int resid = 0;
if (!lockPatternUtils.isSecure()) {
// if there are multiple users, disable "None" setting
UserManager mUm = (UserManager) context. getSystemService(Context.USER_SERVICE);
List<UserInfo> users = mUm.getUsers(true);
final boolean singleUser = users.size() == 1;
if (singleUser && lockPatternUtils.isLockScreenDisabled()) {
if (lockPatternUtils.isLockScreenDisabled()) {
resid = R.xml.security_settings_lockscreen;
} else {
resid = R.xml.security_settings_chooser;