summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-06Snap for 11028996 from 4d51991a5852a4374cb34ea27ae8e624133f87b4 to ↵aml_per_341510010aml_per_341410020aml_per_341311000android14-mainline-permission-releaseAndroid Build Coastguard Worker
mainline-permission-release Change-Id: I1e2a08d0d391d59453e150370c88a2d3b29bf0af
2023-10-28[automerger skipped] Add seal if ashmem-dev is backed by memfd am: ↵Keith Mok
61a2897733 am: 7878e7c9b7 am: fb73f1789e am: 170c133259 am: 72add75484 am: 87675df8a6 am: ad623261ad am: d5104c8343 -s ours am: 85fc048a5f -s ours am skip reason: Merged-In I9288cf30b41e84ad8d3247c204e20482912bff69 with SHA-1 61a2897733 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: I4d96e9b6385e6863aeb23c83e9c235abe733635f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28[automerger skipped] Add seal if ashmem-dev is backed by memfd am: ↵Keith Mok
61a2897733 am: 7878e7c9b7 am: fb73f1789e am: 170c133259 am: 72add75484 am: 87675df8a6 am: ad623261ad am: d5104c8343 -s ours am skip reason: Merged-In I9288cf30b41e84ad8d3247c204e20482912bff69 with SHA-1 61a2897733 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: I46d60bf14611200bc6945996e160b3918146dc41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: ↵Keith Mok
fb73f1789e am: 170c133259 am: 72add75484 am: 87675df8a6 am: 4281014b85 am: 796996fa39 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: I2050914d37661421c76d41cd8b04d298e91fdacb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: ↵Keith Mok
fb73f1789e am: 170c133259 am: 72add75484 am: 87675df8a6 am: 4281014b85 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: Ie36374b481a901a2faa115e21d42601bc520368d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: ↵Keith Mok
fb73f1789e am: 170c133259 am: 72add75484 am: 87675df8a6 am: ad623261ad Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: If132dfd01d2c9323baeeda6dfd7e66722ca955b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: ↵Keith Mok
fb73f1789e am: 170c133259 am: 72add75484 am: 87675df8a6 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: Ie3cf6589fa9817394a0b9e896d87bc26a16e6883 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: ↵Keith Mok
fb73f1789e am: 170c133259 am: 72add75484 am: 87675df8a6 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: Ifce93a193d062ea6af1dd20bc18ecbc15f8cc6c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: ↵Keith Mok
fb73f1789e am: 170c133259 am: 72add75484 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: Ibc20777c221527cd61f0c005c5095c42c1ab5a40 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: ↵Keith Mok
fb73f1789e am: 170c133259 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: I9c9177c3c1ddd27739554384d2a81c2bf4857dcd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: ↵Keith Mok
fb73f1789e Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: Ieebb2b1f87aba8c1427cc4dfb112fe9f40e1956d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7Keith Mok
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: Ie42fc973da02230d438455935f26458f8f94355f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27Add seal if ashmem-dev is backed by memfd am: 61a2897733Keith Mok
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869 Change-Id: I816da3ae81e4eaa4ae120849b57e9685ef8e49de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26Merge "Run fsck to resolve possible data corruption" into udc-dev am: 299569897fLokesh Kumar Goel
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/25156721 Change-Id: If84a03e651a7e606d51b041253f2c87988f75453 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26Merge "Run fsck to resolve possible data corruption" into udc-devLokesh Kumar Goel
2023-10-25Merge "vts_fs_test: Do not check /metadata for automotive" into ↵Treehugger Robot
android14-tests-dev am: 76a9eb4374 am: f7fd336766 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2800753 Change-Id: I225bfb060fac9ad426254c1a28e6b4b4fd2a6690 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25Merge "vts_fs_test: Do not check /metadata for automotive" into ↵Treehugger Robot
android14-tests-dev am: 76a9eb4374 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2800753 Change-Id: Iae65c56e03a953101358290a1e27b9c731a121cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25Merge "vts_fs_test: Do not check /metadata for automotive" into ↵Treehugger Robot
android14-tests-dev
2023-10-24Run fsck to resolve possible data corruptionPaul Lawrence
Trigger fsck on mount of /data if the value of ro.preventative_fsck is not equal to the contents of /metadata/vold/preventative_fsck, then set the file to the property to prevent future runs See b/305658663 for context Bug: 305658663 Test: Make sure fsck run after first boot and not after second Ignore-AOSP-First: Critical UDC only bug Change-Id: I856c812d22363cc1d1e8aa88706d4d3b89044f52
2023-10-23vts_fs_test: Do not check /metadata for automotivePhilip Chen
This aligns with GAS req 4.0. Bug: 307215040 Test: build Change-Id: I2115e147d484d066f892ea50eeca626e64beebfc
2023-09-15Add seal if ashmem-dev is backed by memfdKeith Mok
Need to seal the buffer size in align with ashmem if set to PROT_READ only to prevent untrusted remote process to shrink the buffer size and crash it. Bug: 294609150 Test: build Ignore-AOSP-First: Security Change-Id: I9288cf30b41e84ad8d3247c204e20482912bff69 Merged-In: I9288cf30b41e84ad8d3247c204e20482912bff69 (cherry picked from commit f83c5c8fecf89d9315945368aa20350c2f235cc0)
2023-09-09Move ENOSPC tests to libfiemap. am: 3a60e82512 am: b6c48aedd7David Anderson
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24706667 Change-Id: Ie4916b2bd39096cea6fcb2f71e6fe459c70b2882 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08Move ENOSPC tests to libfiemap. am: 3a60e82512David Anderson
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24706667 Change-Id: I1c6c8697ade7a8688cd826aa2085dd4fe036108c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08Move ENOSPC tests to libfiemap.David Anderson
These tests are still giving us trouble. Move them to libfiemap, which (1) is closer to the source of implementation, and (2) allows us to re-use the temporary filesystem code. This won't perturb the state of the actual device. The new test creates a 64MB ext4 or f2fs mount point as a sandbox, which should be much safer. Bug: 285197715 Bug: 298346574 Bug: 299142557 Test: fiemap_writer_test Merged-In: I33502d49613be4f269a80e5c632514fc56a0246a Ignore-AOSP-First: cherry-pick Change-Id: Iedb7c32a594c3b1fca2904f3441029aaed7edf2a
2023-08-28Snap for 10724605 from 92651d78547c49e206d0601b6e7ad5d1efedc30b to ↵aml_per_341110020aml_per_341110010Android Build Coastguard Worker
mainline-permission-release Change-Id: I435372abafe335f602133edbb0eff82ba6dd0ddb
2023-08-16libprocessgroup: optimize SetAttributeAction::ExecuteForProcess performance ↵Suren Baghdasaryan
am: 1e81ee1363 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24271776 Change-Id: Id7ac56d68513ef51654ee74455af1aaf1b6a9f00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16libprocessgroup: fix reset of file_v2_name am: 72254810d9Suren Baghdasaryan
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24271775 Change-Id: I79820065567d29415470f0b4a3c714f37eab2452 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02Snap for 10597283 from 38dd1561063de13d4f121ec5127ed077d744cb8c to ↵aml_per_341011100aml_per_341011020Android Build Coastguard Worker
mainline-permission-release Change-Id: Ib1812148ef4856d7256d9de0c00a71496ef48702
2023-07-31libprocessgroup: optimize SetAttributeAction::ExecuteForProcess performanceSuren Baghdasaryan
Current implementation of SetAttributeAction::ExecuteForProcess reuses SetAttributeAction::ExecuteForTask while not utilizing available uid/pid information. This results in a call to GetPathForTask() which is an expensive function due to it reading and parsing /proc/$pid/cgroups. This can be avoided if we utilize available uid/pid info and the fact that cgroup v2 attributes share the cgroup v2 hierarchy as process groups, which use a known path template. Bug: 292636609 Change-Id: I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 Merged-In: I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 Signed-off-by: Suren Baghdasaryan <surenb@google.com> (cherry picked from commit 961c01ce23bb886583ca8cac1640806346c09a7f)
2023-07-31libprocessgroup: fix reset of file_v2_nameSuren Baghdasaryan
ProfileAttribute::Reset does not reset file_v2_name, fix that. Also provide ProfileAttribute::file_name() to consolidate the code. Bug: 292636609 Signed-off-by: Suren Baghdasaryan <surenb@google.com> Change-Id: I5b33ca47b4fa5cabf582c8804bd13f72f6e58411 Merged-In: I5b33ca47b4fa5cabf582c8804bd13f72f6e58411 (cherry picked from commit 2ffbeaef3a926b0b5fd873136588deb3ec61ef96)
2023-07-17Revert "Listen on property_service_for_system socket" am: be392fc693Paul Lawrence
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24028969 Change-Id: I0fb8f20ae47d6c2281c235444d62e3d4666d6879 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17Revert "Fix deadlock caused by two-threaded property controls" am: 3196be61fcPaul Lawrence
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24028968 Change-Id: Ic4fdd83e1e382f3a1037cb15030aed4f17421581 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Revert "Listen on property_service_for_system socket"Paul Lawrence
This reverts commit 90879edeea0b2fd1e766428693d736163f39c511. These fixes for b/262208935 introduced a race condition. We believe the race is fixed by ag/23879563, but at this point in the release feel that reverting the fixes and refixing in main is the better solution Test: Builds, boots Bug: 283202477 Bug: 288991737 Ignore-AOSP-First: Reverting CL only in internal Change-Id: I28491e90847f6aa0c9767b27e1d99190637048b9
2023-07-11Revert "Fix deadlock caused by two-threaded property controls"Paul Lawrence
This reverts commit 606afc7b7451aba90e3634076d9b59a5ef08186b. These fixes for b/262208935 introduced a race condition. We believe the race is fixed by ag/23879563, but at this point in the release feel that reverting the fixes and refixing in main is the better solution Test: Builds, boots Bug: 283202477 Bug: 288991737 Ignore-AOSP-First: Reverting CL only in internal Change-Id: I9ae6863b0ea5e064c59d9d34c03d33fa1da12fdc
2023-07-07Snap for 10453563 from 5d4c782b1fedfbf339e7e8a3b5547dd5b29a9526 to ↵aml_per_340916010Android Build Coastguard Worker
mainline-permission-release Change-Id: I842a9e2f939c7e91cfbb9865a4de91853c9dd7ad
2023-07-05Add a variant of ReadFstabFromFile for /proc/mounts.Jiakai Zhang
The variant excludes the code that is not for /proc/mounts, and therefore saves code size when being called. Also, after this change, the call to `SkipMountingPartitions` is skipped for /proc/mounts because it is not needed. Bug: 287958783 Test: atest CtsFsMgrTestCases (cherry picked from https://android-review.googlesource.com/q/commit:29ad6c2aa27384fbd44fbf520528e90ae9ce0c34) Merged-In: Ie243257fa2e87e666be7decf97ec36c806bc4524 Change-Id: Ie243257fa2e87e666be7decf97ec36c806bc4524
2023-06-29Snap for 10405420 from 2d9d60a93db6276d2a3932a109c07987e8f6f4bf to ↵Android Build Coastguard Worker
mainline-permission-release Change-Id: I68bf85d5a894700584bbceb1c1f6ec99138e114f
2023-06-27Make libfstab available to APEXes.Jiakai Zhang
The ART module needs this library to determine whether to put dexopt artifacts in dalvik-cache. Bug: 287958783 Test: m (cherry picked from https://android-review.googlesource.com/q/commit:cf16f4d794a7162e6f418d2308741c6b45806f01) Merged-In: Idf338702d4f54e9c40c0692ea29e7d83e91aca38 Change-Id: Idf338702d4f54e9c40c0692ea29e7d83e91aca38
2023-06-08Merge "ueventd: Fix a race condition in handling device-mapper events." into ↵David Anderson
udc-dev am: c742bfda6b Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23598091 Change-Id: Id7f61666c8886a08d2fa12be10015be307f79661 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "vts_fs_test: Relax filesystem constraints for fixed partitions." into ↵David Anderson
udc-dev am: 7f5512dcd0 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23597911 Change-Id: I29c1d783dfdea4838cf235b7a3394ce105d2f880 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "ueventd: Fix a race condition in handling device-mapper events." into ↵android14-devDavid Anderson
udc-dev
2023-06-08Merge "vts_fs_test: Relax filesystem constraints for fixed partitions." into ↵David Anderson
udc-dev
2023-06-08[automerger skipped] Merge "Merge "Merge "libcutils_test: static libjsoncpp" ↵Automerger Merge Worker
into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9 am: 1400b2dcaa am: 1f80c8bfbf am: 4e9b58603e -s ours am: aa42e3d158 -s ours am skip reason: Merged-In Ic84901ce5af766338b2cab07c3cf10841ba9a150 with SHA-1 447b4a4bf0 is already in history Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475 Change-Id: I6847939d28e3be44179280db7a4323e5f330083f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Merge "Merge "libcutils_test: static libjsoncpp" into ↵Automerger Merge Worker
android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9 am: 1400b2dcaa am: 2d9d60a93d am: 203d050e41 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475 Change-Id: Ib42f61924e723a86da03bc7c68e1b6d770f4581c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Merge "Merge "Merge "libcutils_test: static libjsoncpp" ↵Automerger Merge Worker
into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9 am: 1400b2dcaa am: 1f80c8bfbf am: 4e9b58603e -s ours am skip reason: Merged-In Ic84901ce5af766338b2cab07c3cf10841ba9a150 with SHA-1 447b4a4bf0 is already in history Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475 Change-Id: I3eabdf074d5fbf0263a786a2d81798b25274b9da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Merge "Merge "libcutils_test: static libjsoncpp" into ↵Automerger Merge Worker
android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9 am: 1400b2dcaa am: 1f80c8bfbf Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475 Change-Id: I82aeaa4f7faf1b235ab3c473a503488a85fc281b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Merge "Merge "libcutils_test: static libjsoncpp" into ↵Automerger Merge Worker
android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9 am: 1400b2dcaa am: 2d9d60a93d Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475 Change-Id: I6ad0021cdcea70f85f59645b6a6eb86e291a7028 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Merge "Merge "Merge "libcutils_test: static libjsoncpp" into ↵Automerger Merge Worker
android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9 am: 1400b2dcaa Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475 Change-Id: I89df14ee07d4d6f1ee9ca0e09ae0280310a893e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Merge "Merge "Merge "libcutils_test: static libjsoncpp" into ↵Automerger Merge Worker
android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9 am: 1400b2dcaa Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475 Change-Id: I19a7e0ff5191ea2a11f4ee1bb3dd0f75388d2b4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Merge "Merge "Merge "libcutils_test: static libjsoncpp" into ↵Automerger Merge Worker
android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475 Change-Id: I811591f1eec3ea5b17469b6e2c7b9e3b706d1627 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 20:07:28 +0000