Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit c5d5f2fa authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r4' into staging/lineage-23.2_merge-android-16.0.0_r4

Android 16.0.0 release 4

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaS5hkgAKCRDorT+BmrEO
# eKyuAKCR58v/JqLte68RwVmSa/WloKrtVwCfV1EfXXYVID7Mu6YVkHNsASeoFJw=
# =DMtF
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Dec  2 05:48:34 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-16.0.0_r4': (21 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Allow automated sideload from within recovery.
  Allow configuring if the initial modset flush should be used
  Fix race condition in RecoveryOtaTest.
  Use product build.prop for sideload test
  Test that powerwash OTAs successfully merge in recovery.
  Test that merges work in recovery when forcing a data wipe.
  Test that sideload works when an OTA is in the initiated state.
  Test that sideload works before and during merging.
  Add a test that sideloading works on top of an unverified update.
  Fix C++23 build: define some methods out-of-line
  Switch RecoveryOtaTests to the device test suite.
  Save recovery and dmesg logs on test failure.
  Fix C++23 build: add missing #includes
  Fix sideload test failures in CI.
  Link test libraries statically to avoid dependency issues when packaged.
  Revert "update_verifier: use fixed caremap path"
  Revert "remove care_map generation logic"
  Add a framework for testing adb sideload/recovery OTA.
  remove care_map generation logic
  ...

 Conflicts:
	recovery_main.cpp
	recovery_ui/device.cpp

Change-Id: I8fcdfd003923679d18271a04246e79a9e6553a3c
parents 7be37f20 c33fecc2
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment