Merge "Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`" into main am: 07588c8f9d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2777763

Change-Id: I404ba41156cbb5609cdde1d0f362ff9a3e381875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;
                 }
             }