diff options
| author | Adrian Roos <roosa@google.com> | 2015-04-08 15:24:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-08 15:24:30 +0000 |
| commit | c2ab9341179c876b782c45d3d69897f9fd5fab80 (patch) | |
| tree | 46ee1a2bd7cb777de5c6b1be6d68ab58faa9d76d /src/com/android/settings/SecuritySettings.java | |
| parent | 1951726152cc8b0dde8b35f50c3710f8a56b8934 (diff) | |
| parent | 591dc85017ea19e56c416ae6d1a55b82e29743f4 (diff) | |
| download | packages_apps_Settings-c2ab9341179c876b782c45d3d69897f9fd5fab80.zip packages_apps_Settings-c2ab9341179c876b782c45d3d69897f9fd5fab80.tar.gz packages_apps_Settings-c2ab9341179c876b782c45d3d69897f9fd5fab80.tar.bz2 | |
Merge "Allow none lockscreen with multiple users"
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 3ac2ac6..c74c90a 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; |