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

Commit 447abc81 authored by Eric Biggers's avatar Eric Biggers
Browse files

Include TrustState in TrustManagerService dumpUser 

TrustManagerService dumps the raw aggregated trustable value for each
user, which is not useful because it is not the authoritative trust
state for the user, and it's a computed value (i.e., not real state)
that is computed from other state already dumped.  Therefore, dump the
TrustState instead which is real state that is much more useful.

Test: adb shell dumpsys trust
Flag: exempt, straightforward fix that only affects bugreports
Change-Id: I17103be4d0cc2545e3bdcb1656b35f2d287b01d5
parent 0959d41b

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

+7 −1
Original line number Diff line number Diff line
@@ -814,6 +814,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);
@@ -1628,7 +1634,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(", strongAuthRequired=" + dumpHex(