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



Change-Id: I2d2fa29f74a2fd57c8f1697bb756f819c6ed9a94
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/+/2901311



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

Some test cases in TrustManagerServiceTest are failing on internal main
because http://ag/23669695 changed how PackageMonitor works.  Sending an
ACTION_PACKAGE_CHANGED intent no longer causes
PackageMonitor#onPackageChanged to be called.  This CL fixes the test
failures by making TrustManagerServiceTest call the onPackageChanged
method of TrustManagerService's PackageMonitor directly.

Bug: 29385425
Test: atest TrustManagerServiceTest # on both AOSP and internal main
Change-Id: I0b4708e4223452430ff10e422a71b223656a3360

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



Change-Id: I08bb7b5a264454b2d0242dff0eda5a56fd8d3409
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/+/2897985



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

This android.bp file was moved, and the comment needs to be updated
to reflect that.

Test: Presubmits
Change-Id: I225690505ccbf0f2234e65cbc668ade9bfbd5e17

Merge "Fix UnlockedDeviceRequired with biometric unlock with unified challenge" into main am: f3a6dcf1

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



Change-Id: Ied77ac1ac0e6f661177fbc0ccf37b07887c565bd
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/+/2884226



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

* changes:
  vintf: Disable kernel compat check at boot time.
  vintf: delete deprecated VintfObject.verify.

Before this change, if the kernel has a set of CONFIGs
that is not compatible with the system image, a dialog
is displayed for user / userdebug builds at boot time.

This check has been doing more harm than good because:

- This check is already enforced at build time and during
  VTS tests (See vts_treble_vintf_framework_test).
- The dialog blocks UI automation for tests. For these UI
  automation tests, they need to respond to the dialog.
- GKI has been enforced ecosystem-wide except for a few
  low-end devices of other verticals. For these non-GKI
  devices, the check enforced by VTS should guard this.
  Hence, the check does not give us any signal.
- During development, a kernel that corresponds to the latest
  release (android15 as of now) might not have valid kernel
  config requirements in userspace. Kernel development schedule
  is usually ahead of the userspace development schedule.
  It does not always carry the string "-mainline-", because
  it is not a mainline kernel. To unblock test automation on
  these latest, bleeding-edge kernels, this kernel check should
  go away.
- This is a small steps towards dropping the dependency on libvintf
  on libandroid_runtime. libvintf links to libselinux, which is
  huge. libandroid_runtime loads this, and the memory stays there
  forever. Ideally, we should disable the whole VINTF check at
  boot time, but let's do this one step at a time.

Bug: 272479887
Bug: 270169217
Test: TH
Change-Id: If24cdca9fb535b8f443c0d21f9a46c7ea25c1f9f

It is not used anywhere.

Test: TH
Bug: 270169217
Change-Id: Ifcc8412ed3629d2447908513faf1d6f5ed3f483c

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



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

Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an incomplete pip-entry" into main am: c9f4111c

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



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

Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an incomplete pip-entry" into main

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



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

The primary purpose of validate_framework_keymaps is to perform checks
on all *.kl, *.kcm, and *.idc files using the "validatekeymaps -q"
command. This action can be replaced by using a genrule.

Bug: 318785074
Test: m validate_framework_keymaps
Change-Id: I657466d7ee2cec29900beeb0610cb0d30f34f92e

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



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

Non-A/B has been deprecated for long. During non-A/B updates,
compatibility.zip is checked with VintfObject.verify(), which
is another deprecated function that always returns compatible
if a list of package VINTF XMLs are supplied. (see below.) Hence, the private
RecoverySystem.verifyPackageCompatibility was just useless code
that unconditionally returns true except for invalid ZIP file.
Remove it. Replace the public RecoverySystem.verifyPackageCompatibility
and make it return true unconditonally.

VintfObject.verify() with OTA XMLs are deprecated per
http://b/139300422 [VINTF] Delete OTA vintf checking code
in http://r.android.com/1194233 ("Delete VINTF compatibility checks
during OTA."), in 2019. We had decided that compatibility checks
during OTA should be removed, and moved to OTA generation time instead.
Using an old libvintf on the device to check against new libvintf
metadata required forward compatibility of libvintf, which cannot be
achieved. Instead, the device should verify the signature of the OTA to
verify its source.

Test: TH
Bug: 270169217
Bug: 139300422
Change-Id: I775d29e4cd1d165233e07cfb820d1fe343fa4757

Merge "Uptesting is moving folks to /external/robolectric from /external/robolectric-shadows" into main am: 3a1ad8c7

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



Change-Id: I40114dd42baac8234a6d2c067835844de46bc95a
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/+/2877479



Change-Id: I3fa279a25e2bf62e416ec6fa99662761c5ee1963
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/+/2880991



Change-Id: Id4bfe3a424d410cb780775c21b1ef2290bdac089
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/+/2869797



Change-Id: Ide06b70a540da8afa95a8478c0708de0239ad37a
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/+/2899613



Change-Id: I75b9d342f1c33ab7864c7b7be67e596d138965ff
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/+/2878768



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

Merge "Uptesting is moving folks to /external/robolectric from /external/robolectric-shadows" into main

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



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

This test is in neither presubmit nor postsubmit.  It should be in
presubmit, but add it to postsubmit as a first step.

Bug: 296464083
Test: N/A
Change-Id: I6453d92fea76efab6554e4315cf9f38d84e8e072