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+BmrEOeAUCZeZW7AAKCRDorT+BmrEO # eMBBAJ0S26LIKmwlJMHXgC427MCRZRIXPwCfV7jsbqdKU9Hs7tsV8Dw1EtnW/qI= # =L2Xt # -----END PGP SIGNATURE----- # gpg: Signature made Tue Mar 5 01:19:08 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 2370 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 Eric Biggers (14) and others # Via Automerger Merge Worker (216) and others * tag 'android-14.0.0_r29': (36 commits) Add support for 16k F2FS Use logical path to handle different dm target per boot Add new modules to TEST_MAPPING Verify if pid actually killed for processes with open files Rename "user key" methods in vold Revert "fskeyring & userspace reboot: support CE keys" Evict adoptable storage CE and DE keys when possible Don't erase key from s_new_ce_keys on eviction Call fscrypt_destroy_volume_keys() under mCryptLock Fold read_and_install_user_ce_key() into fscrypt_unlock_user_key() Adding corpus for vold fuzzer Correct reserved blocks to segments Adding public volume mounts for clone user. Do not read ro.apex.updatable. Add vdc volume getStorageSize Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" Use String8/16 c_str Use /data/misc/apexdata for the list of APEXes Revert "Use apexservice to get the list of apexes" Revert "fskeyring & userspace reboot: support CE keys" ... Conflicts: FsCrypt.cpp Change-Id: I69471ad719a544505913dc7a2b156b3e5d54f08f
Loading
Please register or sign in to comment