Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2522501d5b4b4eab8d20986aa1c4b6ed36640211)
Merged-In: Icfec5d0e20b534d7af9aeb1b539a711db76d5e5c
Change-Id: Icfec5d0e20b534d7af9aeb1b539a711db76d5e5c

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6687a2caee0e1ab853c080924a5985fb5be71e28)
Merged-In: Iead08db297fa20963df7ee83b19d5ac76d0d4846
Change-Id: Iead08db297fa20963df7ee83b19d5ac76d0d4846

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:37a0857d61b9e10abe3de1463ffdf4b1d7d5d333)
Merged-In: I8113aa76a60904bc70211f95b1e4c05d11e4ae85
Change-Id: I8113aa76a60904bc70211f95b1e4c05d11e4ae85

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2674875



Change-Id: I3411493e77745db7084fd517939ff7ec409c3aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Move Theme::Entry definition to top of file" into main am: eaf1c10e -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2744279



Change-Id: I0bafaa3d0ede3e5691a4d7245e96540f9231dcbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [RESTRICT AUTOMERGE] Move Theme::Entry definition to top of file am: e8e793a3 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2744279



Change-Id: I92ee99325e21a204269f9a1ca5f46295206a8b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2745422



Change-Id: I704f37e074ae3838066dc95303927993114e1fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2741082



Change-Id: I9576e7dccc11b7c585c036b5147c7f92655465d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2737034



Change-Id: I7ba4a2ef1f4a4aae836e250e174e28c05496af27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Test: none
Change-Id: I122b44261ac892ebab2c0867c27b9b9badc2f0bc

I don't know why I didn't clean these up when I learned about this
trick.

Test: treehugger
Change-Id: Iec74cab28c782a61ef3e48210f3a48043e981212

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2744076



Change-Id: I7dc34fd9a303efe81b5084fbc44243c09a7a1e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2744073



Change-Id: I56ea6a1ed4b337bccf5c78d93455684419c94b32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2737048



Change-Id: I489626a1723c2846216a878b2442c796492e9170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2736661



Change-Id: I5856ce81cef9b039009b1d849acb2b0239f24188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

* 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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2743576



Change-Id: Ie01d38b3587606eff3751177c8e2cbeffedb4524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

TrustManagerService#refreshDeviceLockedForUser() incorrectly considers
the device to be unlocked by a trust agent whenever a trust agent has
granted trust.  This ignores the conditions that
TrustManagerService#updateTrust() has for recognizing trust grants.
This code used to be correct, but it became incorrect in Android 10 when
trust agents were made to extend unlock rather than actively unlock.

The correct state is sent to Keyguard, while the incorrect state is sent
to Keystore.  This would cause UnlockedDeviceRequired keys to sometimes
be usable when the device is locked, though since Android 12 this bug is
hidden by other bugs with UnlockedDeviceRequired keys that make them
unusable in many cases.  However, these bugs are planned to be fixed.

Therefore, fix this bug by making refreshDeviceLockedForUser() use
mUserTrustState, which holds the user's authoritative trust state.

Bug: 296464083
Bug: 298249081
Flag: 296464083
Test: adb shell device_config put hardware_backed_security android.security.fix_unlocked_device_required_keys true
      atest TrustTests
      adb shell device_config put hardware_backed_security android.security.fix_unlocked_device_required_keys false
      atest TrustTests
Change-Id: I0880685c23ebe71a799671fa611fafb42642fa83

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I31c4f4d256ff8dd2b6ed1f6ed74844ccaf7a4814
Merged-In: I31c4f4d256ff8dd2b6ed1f6ed74844ccaf7a4814
(cherry picked from commit c5a0cfdd)

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

- Make assertLocked and assertUnlocked check
  KeyguardManager#isDeviceLocked, in addition to what they were checking
  before.  This is important, as this verifies what TrustManagerService
  (and thus also Keystore) considers the device locked state to be.

- Rename assertUnlocked to assertUnlockedAndTrusted.  This makes it
  clear that it checks for trusted (which implies unlocked), not just
  unlocked (which does not necessarily imply trusted).

- Rename the inner class LockState to TrustState.  This makes it clear
  what it actually is.

- Improve the class comment.

Bug: 296464083
Bug: 298249081
Flag: TEST_ONLY
Test: atest TrustTests
Change-Id: I865ec19dff7ebe00ff083da29154e3c9cb846574

Bug: 296464083
Change-Id: Id3a1e34bfc2d4fbc3ea1c6bfb8fa55d3c28d1687

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2737055



Change-Id: I0d06d70c95d2a1a812f1f4c6e19e23729cd00f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

* changes:
  Support multiple modules for lint_fix
  Add utility lint for metrics on @EnforcePermission
  Move AidlImplementationDetector from global to common

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2744334



Change-Id: I819f46fb6cd0a2a16290d96cca2fa8fb76623dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>