summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-10-09 14:48:15 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-10-09 14:48:15 +0000
commit07588c8f9d8fc05e0b555b3cce286fff403844c8 (patch)
tree3e7f371883bb0a144deb460b437c13b4bf7c086a
parent7039b4f75837c949102caf9f54b9ca6dd1888458 (diff)
parenteea2175d96aa04f13cbdc6379c7e5ab7fa065a88 (diff)
Merge "Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`" into main
-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 36529d824f41..21bfdd87195d 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -1357,7 +1357,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;
}
}