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

Commit 48dcb188 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Include TrustState in TrustManagerService dumpUser am: 447abc81 

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



Change-Id: I489626a1723c2846216a878b2442c796492e9170
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e777b1ee 447abc81

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

+7 −1
Original line number Diff line number Diff line
@@ -862,6 +862,12 @@ public class TrustManagerService extends SystemService { 
        }

    }



    private TrustState getUserTrustStateInner(int userId) {

        synchronized (mUserTrustState) {

            return mUserTrustState.get(userId, TrustState.UNTRUSTED);

        }

    }



    boolean isDeviceLockedInner(int userId) {

        synchronized (mDeviceLockedForUser) {

            return mDeviceLockedForUser.get(userId, true);
@@ -1745,7 +1751,7 @@ public class TrustManagerService extends SystemService { 
            if (isCurrent) {

                fout.print(" (current)");

            }

            fout.print(": trusted=" + dumpBool(aggregateIsTrusted(user.id)));

            fout.print(": trustState=" + getUserTrustStateInner(user.id));

            fout.print(", trustManaged=" + dumpBool(aggregateIsTrustManaged(user.id)));

            fout.print(", deviceLocked=" + dumpBool(isDeviceLockedInner(user.id)));

            fout.print(", isActiveUnlockRunning=" + dumpBool(