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/CryptKeeperSettings.java | |
| parent | bc95630994227736aff46885ca1d9345829e83e2 (diff) | |
| download | packages_apps_Settings-5437588abd69bf3eff59684528aaf50e09b6cffc.tar.gz packages_apps_Settings-5437588abd69bf3eff59684528aaf50e09b6cffc.tar.bz2 packages_apps_Settings-5437588abd69bf3eff59684528aaf50e09b6cffc.zip | |
Require explicit userId in LockPatternUtils
Bug: 18931518
Change-Id: Ie2faa18918aaadf17a84287898438549a693b0cc
Diffstat (limited to 'src/com/android/settings/CryptKeeperSettings.java')
| -rw-r--r-- | src/com/android/settings/CryptKeeperSettings.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java index 2e4aeb89f..c5a06eb64 100644 --- a/src/com/android/settings/CryptKeeperSettings.java +++ b/src/com/android/settings/CryptKeeperSettings.java @@ -27,6 +27,7 @@ import android.content.IntentFilter; import android.content.res.Resources; import android.os.BatteryManager; import android.os.Bundle; +import android.os.UserHandle; import android.os.storage.StorageManager; import android.preference.Preference; import android.text.TextUtils; @@ -160,7 +161,7 @@ public class CryptKeeperSettings extends InstrumentedFragment { Resources res = getActivity().getResources(); ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this); - if (helper.utils().getKeyguardStoredPasswordQuality() + if (helper.utils().getKeyguardStoredPasswordQuality(UserHandle.myUserId()) == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) { showFinalConfirmation(StorageManager.CRYPT_TYPE_DEFAULT, ""); return true; |