Commit cf27af81 authored Aug 03, 2023 by Chandru S Committed by Automerger Merge Worker Aug 03, 2023

Merge "Revert line introduced in previous CL that seems to always pass `false`...

Merge "Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`" into udc-qpr-dev am: 97c0b19d

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

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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}