commit 7ac53eb45eca1b0908295a744bcf6ae7501184ef
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 09 16:10:14 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 09 16:10:14 2023 +0000
tree e4ea29004d77be83d5e66083442243500ece8466
parent c0ae9b5e46073a445079563861d99ffb3f909ae6
parent b828559150a15fe8779e3ec0b3ce7f53f8def1c7

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

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

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

services/core/java/com/android/server/trust/TrustManagerService.java

diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index 36529d82..21bfdd8 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 @@
         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;
                 }
             }