From eea2175d96aa04f13cbdc6379c7e5ab7fa065a88 Mon Sep 17 00:00:00 2001 From: Chandru S Date: Tue, 1 Aug 2023 21:08:56 +0000 Subject: Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged` This change was introduce in commit fd27baff3430033aafbb31bbab6bc560afb8a219. Test: verified manually, 1. adb shell settings put global systemui/buffer/KeyguardUpdateMonitorLog DEBUG 2. adb logcat -s "TrustRepositoryLog:*" 3. Disable Extend Unlock and enable it, see the onTrustManagedChanged being passed with false and then true. Change-Id: I2a4e3579d945a8c993b1a03eb27b05ceb4c4c792 Merged-In: I2a4e3579d945a8c993b1a03eb27b05ceb4c4c792 (cherry picked from commit b772ef6eaabcabefe96c3c284e23e8024b7c545a) --- services/core/java/com/android/server/trust/TrustManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } } -- cgit v1.2.3-59-g8ed1b