Merge tag 'android-12.1.0_r7' into staging/lineage-19.1_merge-android-12.1.0_r7
Android 12.1.0 Release 7 (SQ3A.220605.009.A1) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYp57OwAKCRDorT+BmrEO # eOwnAJ4nj5xu6b+dn2N00qWM6/qU3mk68ACfaU8gU+EronAgAHMDuITQtTJI/6M= # =S5HZ # -----END PGP SIGNATURE----- # gpg: Signature made Tue Jun 7 01:10:03 2022 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 1202 signatures in the past # 7 months. Encrypted 4 messages in the past 4 months. # 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 Jaegeuk Kim (5) and others # Via Automerger Merge Worker (10) and others * tag 'android-12.1.0_r7': Backport of Win-specific suppression of potentially rogue construct that can engage in directory traversal on the host. Backport of Win-specific suppression of potentially rogue construct that can engage in directory traversal on the host. init: Wait for snapuserd before starting second stage libprocessgroup: Use WriteStringToFd for WriteFileAction libprocessgroup: Prevent error spam when tests disable all cpus in a cpuset storageproxyd: Use alternate data path if in DSU state init: Wait for snapuserd before starting second stage init.rc: Set permissions to cgroup.procs files libprocessgroup: Add fd caching support for SetProcessProfiles libprocessgroup: Move fd caching code into FdCacheHelper [DO NOT MERGE] Allow to run fsck.f2fs in first_stage_ramdisk [DO NOT MERGE] Mount /mnt/scracth with -o sync,nodiscard [DO NOT MERGE] Run check_fs only /data is mounted [DO NOT MERGE] Don't use FSCK_LOG_FILE used for ext4 only [DO NOT MERGE] Don't try to mount if the disk has no FS magic [DO NOT MERGE] Retry to unmount /data libprocessgroup: Use WriteStringToFd for WriteFileAction libprocessgroup: Prevent error spam when tests disable all cpus in a cpuset Conflicts: libprocessgroup/task_profiles.cpp libprocessgroup/task_profiles.h Change-Id: I7a57400978d11a576f92411224d6338de41004fe
Loading
Please register or sign in to comment