diff options
| author | 2023-09-09 00:47:17 +0000 | |
|---|---|---|
| committer | 2023-09-09 00:47:17 +0000 | |
| commit | fc9deec0f725e008e11305d5ca886bc2ff2ded61 (patch) | |
| tree | 4852781202c286f69f180fb0fc375c37bb3c6a8e | |
| parent | 0fdc9ecc3bb515ac924d3a315937896c20511fbe (diff) | |
| parent | 363042b92d3a91b59f178a75f23fecb34308114c (diff) | |
Include TrustState in TrustManagerService dumpUser am: 447abc81d5 am: 48dcb18896 am: 6c9ac2625e am: 28f4ca9577 am: 363042b92d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2737048
Change-Id: I4667c961b83750d4f7b4d07a8c95c5e7b1a6eafa
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 f0c729f67bca..0b7f6db3987e 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -760,6 +760,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); @@ -1643,7 +1649,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( |