diff options
| author | Adrian Roos <roosa@google.com> | 2015-04-16 17:11:22 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-04-28 12:01:09 -0700 |
| commit | 5437588abd69bf3eff59684528aaf50e09b6cffc (patch) | |
| tree | e2b8b27419fbf1473748b6550d224b6212c185a2 /src/com/android/settings/ChooseLockSettingsHelper.java | |
| parent | bc95630994227736aff46885ca1d9345829e83e2 (diff) | |
| download | packages_apps_Settings-5437588abd69bf3eff59684528aaf50e09b6cffc.zip packages_apps_Settings-5437588abd69bf3eff59684528aaf50e09b6cffc.tar.gz packages_apps_Settings-5437588abd69bf3eff59684528aaf50e09b6cffc.tar.bz2 | |
Require explicit userId in LockPatternUtils
Bug: 18931518
Change-Id: Ie2faa18918aaadf17a84287898438549a693b0cc
Diffstat (limited to 'src/com/android/settings/ChooseLockSettingsHelper.java')
| -rw-r--r-- | src/com/android/settings/ChooseLockSettingsHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java index c9f20ff..8b8d976 100644 --- a/src/com/android/settings/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/ChooseLockSettingsHelper.java @@ -21,6 +21,7 @@ import android.app.Activity; import android.app.Fragment; import android.app.admin.DevicePolicyManager; import android.content.Intent; +import android.os.UserHandle; import com.android.internal.widget.LockPatternUtils; @@ -116,7 +117,7 @@ public final class ChooseLockSettingsHelper { boolean returnCredentials, boolean external, boolean hasChallenge, long challenge) { boolean launched = false; - switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) { + switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(UserHandle.myUserId())) { case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: launched = launchConfirmationActivity(request, title, header, description, returnCredentials || hasChallenge |