From 1e7b8f86d8aa46d2ed24b75adb453833ef2d1a88 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Fri, 26 Jun 2015 18:49:35 -0700
Subject: [PATCH] Fix userId for credentials from managed profiles

Bug: 22094377
Change-Id: Ia98d0e386d4c56f3eb502ff11f86b0fd7dadea3c
---
 src/com/android/settings/CredentialStorage.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 90efd58967..a12369b941 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);
     }
 
-- 
2.11.0