Merge tag 'android-14.0.0_r50' into staging/lineage-21.0_merge-android-14.0.0_r50
Android 14.0.0 Release 50 (AP2A.240605.024) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzmgAKCRDorT+BmrEO # eDmTAJ9QtL7JdJI9M5/AEPzezKZuFOwDUQCdEBtfylvKsSOyMu4JUnAx1b1jUgk= # =GsKk # -----END PGP SIGNATURE----- # gpg: Signature made Tue Jun 11 00:43:54 2024 EEST # 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 2468 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 Kelvin Zhang (3) and others # Via Automerger Merge Worker (24) and others * tag 'android-14.0.0_r50': misctrl: use libbase combined logging misctrl: read message, incl 16kb flag intro misctrl Reland "Only format /data in recovery if user specified a new fstype" Add kcmdline bootloader message Revert "Only format /data in recovery if user specified a new fstype" Only format /data in recovery if user specified a new fstype Fix the problem of incremental OTA upgrade failure (recovery part) Add recovery flag to reformat /data Conflicts: install/include/install/wipe_data.h recovery.cpp Change-Id: Iefa48a2c81c0ec726dc9798ac7a59b25f12dddde
Loading
Please register or sign in to comment