diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-06-26 18:49:35 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-06-29 20:34:27 +0000 |
| commit | 1e7b8f86d8aa46d2ed24b75adb453833ef2d1a88 (patch) | |
| tree | caa6f976a3410a1176df79233cd638f8203439ad /src/com/android/settings/CredentialStorage.java | |
| parent | 312c90c8caa4fdc59e9a4bd9f900d23ec7274495 (diff) | |
| download | packages_apps_Settings-1e7b8f86d8aa46d2ed24b75adb453833ef2d1a88.zip packages_apps_Settings-1e7b8f86d8aa46d2ed24b75adb453833ef2d1a88.tar.gz packages_apps_Settings-1e7b8f86d8aa46d2ed24b75adb453833ef2d1a88.tar.bz2 | |
Fix userId for credentials from managed profiles
Bug: 22094377
Change-Id: Ia98d0e386d4c56f3eb502ff11f86b0fd7dadea3c
Diffstat (limited to 'src/com/android/settings/CredentialStorage.java')
| -rw-r--r-- | src/com/android/settings/CredentialStorage.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java index 90efd58..a12369b 100644 --- a/src/com/android/settings/CredentialStorage.java +++ b/src/com/android/settings/CredentialStorage.java @@ -206,8 +206,9 @@ public final class CredentialStorage extends Activity { * Returns true if the currently set key guard matches our minimum quality requirements. */ private boolean checkKeyGuardQuality() { + UserInfo parent = UserManager.get(this).getProfileParent(UserHandle.myUserId()); int quality = new LockPatternUtils(this).getActivePasswordQuality( - UserHandle.myUserId()); + parent != null ? parent.id : UserHandle.myUserId()); return (quality >= MIN_PASSWORD_QUALITY); } |