Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ac53eb4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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 main am: 07588c8f am: b8285591

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



Change-Id: I791edd7034db851ee5918c9484e1f89f91e198be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0ae9b5e b8285591

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1357,7 +1357,7 @@ public class TrustManagerService extends SystemService { 
        for (int i = 0; i < mActiveAgents.size(); i++) {

        for (int i = 0; i < mActiveAgents.size(); i++) {

            AgentInfo info = mActiveAgents.valueAt(i);

            AgentInfo info = mActiveAgents.valueAt(i);

            if (info.userId == userId) {

            if (info.userId == userId) {

                if (info.agent.isTrustableOrWaitingForDowngrade()) {

                if (info.agent.isManagingTrust()) {

                    return true;

                    return true;

                }

                }

            }

            }