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

Skip to content
Unverified Commit 4c4c3f83 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r29' into staging/lineage-21.0_merge-android-14.0.0_r29

Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWvgAKCRDorT+BmrEO
# eFBjAJ96GtOFW6/ppxZqKWkcr9Hi7mNtZwCePXYuvKYGa/vjTruBd61peAisHlg=
# =74+s
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:22 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2332 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi (11) and others
# Via Automerger Merge Worker (316) and others
* tag 'android-14.0.0_r29': (29 commits)
  updater_sample: tools: import AbOtaPropertyFiles from ota_utils
  Update recovery to use Health AIDL HAL V3.
  support wrist orientation in recovery/fastbootd
  Revert "recovery: fix UI error when directories too many [1/1]"
  Fix removal of fastbootd logo for wear
  Add --keep_memtag_mode for --wipe_data
  recovery: fix UI error when directories too many [1/1]
  MinADB: Companion CL to deprecate tMsg
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add flag whether MTE state was forced
  recovery: Fix old reference to libsnapshot_snapuserd.
  update_verifier: don't pass an unused command-line argument
  Read brightness-related properties from `ro.recovery.ui`
  Read brightness-related properties from `ro.recovery.ui`
  Use the hermetic gzip instead of minigzip.
  Wear Recovery UI: Adjust for round screens
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  ...

 Conflicts:
	applypatch/vendor_flash_recovery.rc
	fastboot/fastboot.cpp
	install/include/install/wipe_data.h
	minui/graphics.cpp
	minui/include/minui/minui.h
	recovery_ui/include/recovery_ui/ui.h
	recovery_ui/ui.cpp

Change-Id: Idce2cb0fbd70665c771e2a39c4928810be75b2d1
parents 50ee1a36 dccf4426
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