Fix userId for credentials from managed profiles

Bug: 22094377
Change-Id: Ia98d0e386d4c56f3eb502ff11f86b0fd7dadea3c

diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 90efd58..a12369b 100644 (file)
--- 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);
     }