diff options
| author | Adrian Roos <roosa@google.com> | 2015-04-07 16:55:29 +0200 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-04-07 16:55:29 +0200 |
| commit | 591dc85017ea19e56c416ae6d1a55b82e29743f4 (patch) | |
| tree | df1b81b23061663d9472707f23fe404b262f0319 /src/com/android/settings/SecuritySettings.java | |
| parent | e06c34464e151ee0feddb9762319dc38909dcaa5 (diff) | |
| download | packages_apps_Settings-591dc85017ea19e56c416ae6d1a55b82e29743f4.zip packages_apps_Settings-591dc85017ea19e56c416ae6d1a55b82e29743f4.tar.gz packages_apps_Settings-591dc85017ea19e56c416ae6d1a55b82e29743f4.tar.bz2 | |
Allow none lockscreen with multiple users
Bug: 19962043
Change-Id: Ic7dcbd371d700bf8796f50469a7ac7d529ec491d
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index df217c8..cb0fbdb 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -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; |