Require explicit userId in LockPatternUtils

Bug: 18931518 Change-Id: Ie2faa18918aaadf17a84287898438549a693b0cc
2015-04-16 17:11:22 -07:00
parent bc95630994
commit 5437588abd
18 changed files with 112 additions and 69 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -357,7 +357,7 @@ public class UserSettings extends SettingsPreferenceFragment

    private boolean hasLockscreenSecurity() {
        LockPatternUtils lpu = new LockPatternUtils(getActivity());
-        return lpu.isLockPasswordEnabled() || lpu.isLockPatternEnabled();
+        return lpu.isSecure(UserHandle.myUserId());
    }

    private void launchChooseLockscreen() {