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
No related branches found
No related tags found
Showing
- core/java/android/security/flags.aconfig 7 additions, 0 deletionscore/java/android/security/flags.aconfig
- services/core/java/com/android/server/trust/TrustManagerService.java 13 additions, 2 deletions...re/java/com/android/server/trust/TrustManagerService.java
- tests/TrustTests/Android.bp 1 addition, 0 deletionstests/TrustTests/Android.bp
- tests/TrustTests/src/android/trust/test/GrantAndRevokeTrustTest.kt 53 additions, 1 deletion...stTests/src/android/trust/test/GrantAndRevokeTrustTest.kt
- tests/TrustTests/src/android/trust/test/TemporaryAndRenewableTrustTest.kt 2 additions, 2 deletions.../src/android/trust/test/TemporaryAndRenewableTrustTest.kt
- tests/TrustTests/src/android/trust/test/lib/LockStateTrackingRule.kt 30 additions, 11 deletions...Tests/src/android/trust/test/lib/LockStateTrackingRule.kt
- tests/TrustTests/src/android/trust/test/lib/ScreenLockRule.kt 1 addition, 1 deletion...s/TrustTests/src/android/trust/test/lib/ScreenLockRule.kt
Loading
Please register or sign in to comment