diff options
| author | 2023-09-08 17:44:27 +0000 | |
|---|---|---|
| committer | 2023-09-08 17:44:27 +0000 | |
| commit | b2348adbb8137214baca45a338de7219d8528f4b (patch) | |
| tree | c42f01f910dcfedc22f9a9d7b6e701ea526583a9 /tools/aapt/ZipEntry.cpp | |
| parent | 3b7fe89edaa60739134b34c7ad0b3755e29a7342 (diff) | |
| parent | c677227767d6c500c4a17c2008b195c57c77a40f (diff) | |
Merge changes I0880685c,I865ec19d,Id3a1e34b,I31c4f4d2,I17103be4 into main
* changes:
Fix refreshDeviceLockedForUser() to use correct trust state
Improve LockStateTrackingRule
Add flag fix_unlocked_device_required_keys
Fix kotlin nullable errors in TrustTests
Include TrustState in TrustManagerService dumpUser
Diffstat (limited to 'tools/aapt/ZipEntry.cpp')
0 files changed, 0 insertions, 0 deletions