diff options
| author | 2023-09-08 19:02:16 +0000 | |
|---|---|---|
| committer | 2023-09-08 19:02:16 +0000 | |
| commit | 6c9ac2625ea3ccc1c9a4e13ce3d2c396d7926eef (patch) | |
| tree | 3013510be51d4aadb39247bee1e5a673e6bee2ff | |
| parent | eec5221aab11e721b8b9f06e9f3e257fb9436571 (diff) | |
| parent | 48dcb188962ab2fca8660adeb298de02c59676ca (diff) | |
Include TrustState in TrustManagerService dumpUser am: 447abc81d5 am: 48dcb18896
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2737048
Change-Id: I7848dc6332c2ae6f0c62e5a9070876909ffaf175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/trust/TrustManagerService.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index fb188c0c4948..5c3761b486ad 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -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( |