summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chandru S <chandruis@google.com> 2023-08-03 23:33:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-08-03 23:33:01 +0000
commit97c0b19d9e7d62d8c403fc45a0045a531d00dba6 (patch)
treeb97226d730887e2b1babdeb856d9a457c2e7263b
parent484b00fd26ac17d03ae8f7dd0b19b86911d46a3f (diff)
parentb772ef6eaabcabefe96c3c284e23e8024b7c545a (diff)
Merge "Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`" into udc-qpr-dev
-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 bab4886a6c6a..bed69fc635b8 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -1401,7 +1401,7 @@ public class TrustManagerService extends SystemService {
for (int i = 0; i < mActiveAgents.size(); i++) {
AgentInfo info = mActiveAgents.valueAt(i);
if (info.userId == userId) {
- if (info.agent.isTrustableOrWaitingForDowngrade()) {
+ if (info.agent.isManagingTrust()) {
return true;
}
}