Bug: 177641730
Test: n/a
Change-Id: Iaea2b7d55094a0e71278bbd2a09b5d6ce9de2830

If a key does not have the MGF_DIGEST tag in its key characteristics,
do not include the MGF_DIGEST tag for it (even if the algorithm string
specifies it).

This fixes an issue with keys that were generated on Android 13, where
the MGF_DIGEST tag was not propagated from the SPI layer. Such keys will
not have the MGF_DIGEST tag and so it will not be added by the SPI layer
even if the algorithm string specifies it. This maintains Android 13's
(incorrect) behaviour of ignoring the MGF Digest specification, but is
necessary to use those keys (otherwise KeyMint will error out
on begin() due to an incompatible MGF digest specification).

Bug: 278157584
Test: atest CtsKeystoreWycheproofTestCases:com.google.security.wycheproof.RsaOaepTest
Change-Id: I0f1fa7983f9c771bec3196c6a617eb7044ac2e79

* changes:
  Add VanillaIceCream to android.os.Build
  Add VanillaIceCream to aapt2 codenames

This doesn't do anything, but is required for upcoming
ConnectivityService patches.

Bug: 277100090
Test: Build, smoke test by loading on Pixel 6
Change-Id: Ib48a39f0054edc7456d005a6f90a5da3fba8faab
Merged-in: I27ae40f345532836bdcb0e0dc3d7d7315c110d29

Change-Id: Iddc33b0ec9a8bd464b131e16bc64dcc774cb5d87
Test: N/A
Bug: N/A

Bug: 279492191
Test: m checkbuild
Change-Id: I1b0a9d667cd481e91cfe473747a9ad38f77b4455
Merged-In: I1b0a9d667cd481e91cfe473747a9ad38f77b4455

Bug: 279492191
Test: m checkbuild
Change-Id: Ia8bd807ab25260ff6716e2aea36e4d3e8567eb22
Merged-In: Ia8bd807ab25260ff6716e2aea36e4d3e8567eb22

Bug: 278147400
Test: TH
Change-Id: I8292fc4bb8f3790b59436f5009b02c64e8244698

This fixes a bug where if the EditText view has or had focus and then
is removed from the layout and re-added the cursor does not resume
blinking.

There was a change several months ago that prevented the cursor from
blinking when the window is no longer visible.  That change added a
check in shouldBlink to verify that the window is visible.  This
created a situation where the window might not be visible when
makeBlink is called from onFocusChanged and as a result mBlink is
never instantiated. This resulted in the cursor not blinking after an
app starts. The fix was to call makeBlink again when onAttachToWindow
is called.  The Window is visible at this point and the cursor blinks
as expected.

The reason the code change below is needed is in the case where a view
is removed and added back after the mBlink object has been
instantiated. A call to unCancel is needed to ensure that the cursor
resumes blinking as expected. This was identified in this change
aosp/2540031.

The change also guards against the window not visible case as outlined
above.

Bug: 278907680
Test: Added following CTS test:
      testCursorResumeBlinking_AfterFocusedView_DynamicallyRemovedAdded
      testCursorBlinking_ViewDynamically_RemovedAdded_NeverHadFocus
      testCursorSuspendBlinking_ViewDynamicallyRemoved
      testCursorNotBlinking_ViewDynamicallyAdded_NoFocus
      testCursorBlinking_ViewDynamicallyAdded_WithFocus
Change-Id: I07afc7ef1a707549240479015a00a66db814afb7

- to be used as a static lib by mainline modules

Bug: 271127104
Test: m
Change-Id: I80b03fb6dbcff95dd7fc0d5c4af6e868629cce64
Merged-In: I80b03fb6dbcff95dd7fc0d5c4af6e868629cce64

* changes:
  Tweak remote_provisioning command line interface
  Add command line interface for remote_provisioning

See ag/22707221

Change-Id: I80b84596c14dd8ea66baba71a0e94d2c1abf02f8

- Make fields that are only assigned once private.
- Fix typos.
- Remove unnecessary boxed types.
- Remove unused default value variable assignemnts.
- Merge repetitive exception handling.

Test: m dist -j && acloud create --local-instance --local-image
Change-Id: Idc2aa16798d6cf4fe9df0a13f37e002667a1de41

Test: N/A
Change-Id: Id95f242ba2be042c592fc11b5a11e16853565a49

Change-Id: I5724508e98283f42ca6cc3b18ecd0e02ff785c4f
Merged-In: Iccada6fdc4abac360533389c68c44af7c2c90b27
Test: presubmit
Bug: 269138674

Only print an IRPC's minimum number of keys on versions of the HAL where
it will be meaningful and initialized. Also indicate which options could
not be understood.

Test: atest RemoteProvisioningShellCommandTest
Bug: 265747549
Change-Id: I0dbcd6af5a5de20783b6d57874fb67801a39240d

Provide an ADB interface to interact with the remote_provisioning
service for diagnostic purposes. The service reports details of the IRPC
components in dumpsys and allows ADB to query the IRPC instances and
request a CSR from each of them.

Test: adb shell dumpsys remote_provisioning
Test: adb shell cmd remote_provisioning
Test: atest RemoteProvisioningShellCommandTest
Bug: 265747549
Change-Id: I593a4b599f4fc8e27d7f79d1d5f3955eabc9641d
Merged-In: I593a4b599f4fc8e27d7f79d1d5f3955eabc9641d

Change-Id: I359dbf9adab003b822a2b74f6a3b942e6d594327
Test: presubmit
Bug: 269138674

Merge "Adding OWNERS to rollback tests (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:040afecdb0ec503c7588ab252f50f73334bf14bd)"

(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:040afecdb0ec503c7588ab252f50f73334bf14bd)

Change-Id: I7b5d930159a8ee9966374db83d24b8cea5f796b9

Merge "Restoring SDR brightness immediately when entering dim state if the device is in HDR brightness scale mode."