summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/trust
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-09-01 16:24:32 +0200
committerAdrian Roos <roosa@google.com>2014-09-01 23:03:28 +0200
commit1572ee379e1d070c7ad1c37a626ed25db5341a3e (patch)
tree8f0f24b8b10e3488c5bd0c96fe313dc667834042 /services/core/java/com/android/server/trust
parentef56dad5b82e3ff77e90382a108bcc7b13447e96 (diff)
downloadframeworks_base-1572ee379e1d070c7ad1c37a626ed25db5341a3e.zip
frameworks_base-1572ee379e1d070c7ad1c37a626ed25db5341a3e.tar.gz
frameworks_base-1572ee379e1d070c7ad1c37a626ed25db5341a3e.tar.bz2
Trust: Look at the security unlock method of the right user
Follow up to Ic9e93862c722ebc529f5b2010b9cea941f569ce7. Bug: 17107213 Change-Id: I8f3c19aedeaca3f265c98a4fb60ab74b115fca47
Diffstat (limited to 'services/core/java/com/android/server/trust')
-rw-r--r--services/core/java/com/android/server/trust/TrustManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index 98c3381..7e0215c 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -168,7 +168,7 @@ public class TrustManagerService extends SystemService {
obsoleteAgents.addAll(mActiveAgents);
for (UserInfo userInfo : userInfos) {
- if (lockPatternUtils.getKeyguardStoredPasswordQuality()
+ if (lockPatternUtils.getKeyguardStoredPasswordQuality(userInfo.id)
== DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) continue;
DevicePolicyManager dpm = lockPatternUtils.getDevicePolicyManager();
int disabledFeatures = dpm.getKeyguardDisabledFeatures(null, userInfo.id);