summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-01-27Merge cherrypicks of ['android-review.googlesource.com/2929791', ↵android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
'android-review.googlesource.com/2929790'] into 24Q1-release. Change-Id: I90b726358d80f569dde7b69fc7827cf9bf2a1812
2024-01-27Revert "Migrate the blkio controller to the v2 cgroup hierarchy"Randall Huang
This reverts commit f99ca8aeb1d20218663911ec3d1ea12b2ee9fd05. Reason for revert: b/2768906 (cherry picked from https://android-review.googlesource.com/q/commit:d0ce4ca33cd5b1a48a3ef7f8b6da39e5498421c5) Merged-In: I9ce259a2c96e9f8dd8c7598204c35922b56f7a0a Change-Id: I9ce259a2c96e9f8dd8c7598204c35922b56f7a0a
2024-01-27Revert "task_profiles.json: Set io.prio.class"Randall Huang
This reverts commit 9bba87244d6bbf46e776834d0917b2dd1143f31d. Reason for revert: b/314861914 (cherry picked from https://android-review.googlesource.com/q/commit:9e38fe5299375f87aac4c3a33dc0a5a47c3859ee) Merged-In: I566c4fa98e4d1bd8701086c2b5e34802ee0a89fb Change-Id: I566c4fa98e4d1bd8701086c2b5e34802ee0a89fb
2024-01-26[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-11363197-L23500030001623370 into 24Q1-release. COASTGUARD_SKIP: I566c4fa98e4d1bd8701086c2b5e34802ee0a89fb COASTGUARD_SKIP: I9ce259a2c96e9f8dd8c7598204c35922b56f7a0a COASTGUARD_SKIP: Ic73043d66fc7f32256afb3a5d1904284c537b724 Change-Id: Ie14f7dce80a4f6a602216cb32aa6f0239d83404f
2024-01-26Merge cherrypicks of ['android-review.googlesource.com/2929791', ↵Android Build Coastguard Worker
'android-review.googlesource.com/2929790'] into sparse-11363197-L23500030001623370. SPARSE_CHANGE: I566c4fa98e4d1bd8701086c2b5e34802ee0a89fb SPARSE_CHANGE: I9ce259a2c96e9f8dd8c7598204c35922b56f7a0a Change-Id: Ic73043d66fc7f32256afb3a5d1904284c537b724
2024-01-26Revert "Migrate the blkio controller to the v2 cgroup hierarchy"Randall Huang
This reverts commit f99ca8aeb1d20218663911ec3d1ea12b2ee9fd05. Reason for revert: b/2768906 (cherry picked from https://android-review.googlesource.com/q/commit:d0ce4ca33cd5b1a48a3ef7f8b6da39e5498421c5) Merged-In: I9ce259a2c96e9f8dd8c7598204c35922b56f7a0a Change-Id: I9ce259a2c96e9f8dd8c7598204c35922b56f7a0a
2024-01-26Revert "task_profiles.json: Set io.prio.class"Randall Huang
This reverts commit 9bba87244d6bbf46e776834d0917b2dd1143f31d. Reason for revert: b/314861914 (cherry picked from https://android-review.googlesource.com/q/commit:9e38fe5299375f87aac4c3a33dc0a5a47c3859ee) Merged-In: I566c4fa98e4d1bd8701086c2b5e34802ee0a89fb Change-Id: I566c4fa98e4d1bd8701086c2b5e34802ee0a89fb
2023-12-20Merge cherrypicks of ['android-review.googlesource.com/2877498'] into ↵Android Build Coastguard Worker
24Q1-release. Change-Id: I9a0a2031afecf8b1cbeaf5e3a988d0ac50ded170
2023-12-20Disable DSU in recovery modeChun-Wei Wang
DSU (modifying mounting paths) will cause OTA update to fail in recovery mode Bug: 315887685 Test: 1. enter DSU mode 2. adb reboot recovery 3. select "Apply update from ADB" 4. adb sideload some-ota-update.zip (cherry picked from https://android-review.googlesource.com/q/commit:222ffc59197a80b3a92e4755e14a570243b8bcbc) Merged-In: I6aec86893b7f8aa9e34f158269ebe2fd9dd98b33 Change-Id: I6aec86893b7f8aa9e34f158269ebe2fd9dd98b33
2023-12-15Snap for 11220357 from 823e0bf15f130832b3d3a4df702ba0856f24ed80 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Id2de24c5f959fe3a33ddba49c3f1451a709d98d0
2023-12-14Merge "Revert "snapuserd: opt out of Global ThinLTO to workaround segfault"" ↵Treehugger Robot
into main am: b0c6a5dfd7 am: 3b3c06e73b am: 14a682f6ae Original change: https://android-review.googlesource.com/c/platform/system/core/+/2869606 Change-Id: Id79dc8a7d7b97999573f9645fb77aa1e99d2a567 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Revert "snapuserd: opt out of Global ThinLTO to workaround segfault"" ↵Treehugger Robot
into main am: b0c6a5dfd7 am: 3b3c06e73b Original change: https://android-review.googlesource.com/c/platform/system/core/+/2869606 Change-Id: I8e45f9682687a064ee58d32a3eedb7883590933c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Use correct stack depot size in __scudo_get_error" into main am: ↵Florian Mayer
26c0b9017b am: 30fe6fa7d7 am: 5e6f4e6f1c Original change: https://android-review.googlesource.com/c/platform/system/core/+/2874634 Change-Id: Ieb050ec74729dc65228d36c6dc6689ea9d485b5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Revert "snapuserd: opt out of Global ThinLTO to workaround segfault"" ↵Treehugger Robot
into main am: b0c6a5dfd7 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2869606 Change-Id: I78d36953d615e8e5dbf04f05f9a29b5218e9f3f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Use correct stack depot size in __scudo_get_error" into main am: ↵Florian Mayer
26c0b9017b am: 30fe6fa7d7 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2874634 Change-Id: Ica1caf67d7ec711d937bfc3093252d76df0479fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Revert "snapuserd: opt out of Global ThinLTO to workaround segfault"" ↵Treehugger Robot
into main
2023-12-14Snap for 11216811 from 5b4a005180a89bf30643ae56c4ec52ebf901e4f0 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ia3c520c120562b8d36bdf0ae9d45dda26f6ec036
2023-12-14Merge "healthd: Add handling for "Calibration required" battery health." ↵David Anderson
into main am: fb589aac77 am: 1d2e45dd56 am: fab3ca4f23 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2868428 Change-Id: I42ce4bf281c4892a4427563504021eb5b398ceea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Merge "Use correct stack depot size in __scudo_get_error" into main am: ↵Florian Mayer
26c0b9017b Original change: https://android-review.googlesource.com/c/platform/system/core/+/2874634 Change-Id: I73a34536a659bcfd24397eb11eb5cd0de93a60f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Merge "healthd: Add handling for "Calibration required" battery health." ↵David Anderson
into main am: fb589aac77 am: 1d2e45dd56 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2868428 Change-Id: I6054367db80d7ad9ac626424d53705d15f744941 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Merge "Use correct stack depot size in __scudo_get_error" into mainFlorian Mayer
2023-12-13Merge "healthd: Add handling for "Calibration required" battery health." ↵David Anderson
into main am: fb589aac77 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2868428 Change-Id: I23d1d39e53f35d081b56fd56f1be4567a39471d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Merge "healthd: Add handling for "Calibration required" battery health." ↵David Anderson
into main
2023-12-13Use correct stack depot size in __scudo_get_errorFlorian Mayer
This is a no-op but will be used in upcoming scudo changes that allow to change the depot size at process startup time, and as such we will no longer be able to call __scudo_get_stack_depot_size in debuggerd. Bug: 309446692 Change-Id: Ib64b9d042b2a2088484ec5e61944c089a1d85314
2023-12-13Merge "libsnapshot: skip connecting to daemon for legacy VAB" into main am: ↵Akilesh Kailash
d1d9b0ef8a am: 2ee526270b am: 5cca47da40 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2871223 Change-Id: I01ea291d7e83356d3b0f57cfa242637aeed0d803 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Merge "libsnapshot: skip connecting to daemon for legacy VAB" into main am: ↵Akilesh Kailash
d1d9b0ef8a am: 2ee526270b Original change: https://android-review.googlesource.com/c/platform/system/core/+/2871223 Change-Id: Id57eab22cc3a0a3dc251ee9464fbedca2e75e0d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Merge "libsnapshot: skip connecting to daemon for legacy VAB" into main am: ↵Akilesh Kailash
d1d9b0ef8a Original change: https://android-review.googlesource.com/c/platform/system/core/+/2871223 Change-Id: If2868943cba704c521938f94fb6cb6760d04d2d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Snap for 11211173 from 08d0a9271a9c326c0aa711eb477ae218a54e9c60 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ie443c06483f02ee331eeb56707c966875d628ed3
2023-12-13Merge "libsnapshot: skip connecting to daemon for legacy VAB" into mainAkilesh Kailash
2023-12-12libsnapshot: skip connecting to daemon for legacy VABAkilesh Kailash
There is no need to connect to daemon for legacy VAB. Bug: 311900089 Test: treehugger - presubmit Change-Id: I2256cee611431ab2a286730c61092d2c546caf1e Signed-off-by: Akilesh Kailash <akailash@google.com>
2023-12-12Merge "healthd: Add support for the new Health HAL v3 properties." into main ↵David Anderson
am: bc9acc9f64 am: e80b0c3498 am: dd04b7bea4 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2866063 Change-Id: Ic4f14ee667be1df768a69860928f9e0a30268a60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "healthd: Add support for the new Health HAL v3 properties." into main ↵David Anderson
am: bc9acc9f64 am: e80b0c3498 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2866063 Change-Id: I25819bd4b342f87b8f6783fc73b03a0cfc0f7107 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "healthd: Add support for the new Health HAL v3 properties." into main ↵David Anderson
am: bc9acc9f64 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2866063 Change-Id: Ibd1f1ac55a73e7f786071c032a0d0df8483f4f38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "healthd: Add support for the new Health HAL v3 properties." into mainDavid Anderson
2023-12-12Revert "snapuserd: opt out of Global ThinLTO to workaround segfault"Yi Kong
This reverts commit 9d0c06d3e203b8bdb6710332dc59f51948788e01. The failure is fixed by https://r.android.com/2725997. Workaround no longer needed. Test: manual Bug: 208565717 Bug: 295944813 Change-Id: I83638938bf52a4b2b1e72743f892c579622ba9e6
2023-12-12Merge changes from topic "health-v3" into main am: 99a33df544 am: 83fe701de3 ↵David Anderson
am: 968e404586 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2865315 Change-Id: I4bff756502026caee7afe1f992964097c762e6ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge changes from topic "health-v3" into main am: 99a33df544 am: 83fe701de3David Anderson
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2865315 Change-Id: I5c9a8a33f0077d3dad8c5af69c50cdb8d622e433 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge changes from topic "health-v3" into main am: 99a33df544David Anderson
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2865315 Change-Id: Ia1b5bfea30159429328ff909e531f63bffac004f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge changes from topic "health-v3" into mainDavid Anderson
* changes: fastboot: Add getvar commands to query battery part info. Update fastbootd to use Health AIDL HAL V3. Update healthd to use Health AIDL HAL V3. Update storaged to use Health AIDL HAL V3.
2023-12-12Merge "Support batch writes for non-compressed ops" into main am: 314818029c ↵Treehugger Robot
am: 17007a449d am: 0d66a52161 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2863806 Change-Id: If550f284b82c8e3f3da367d7d5b1e50305414323 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Handle scudo_stack_depot_size = 0" into main am: 1f5b0f9fee am: ↵Treehugger Robot
b5d7105c22 am: ab9511c921 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2858490 Change-Id: I9536c1fc71a44ed1fd707e140db421d3bda719b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Support batch writes for non-compressed ops" into main am: 314818029c ↵Treehugger Robot
am: 17007a449d Original change: https://android-review.googlesource.com/c/platform/system/core/+/2863806 Change-Id: I1e319fa643e3deba4c756e02eddf79e663aba3b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Handle scudo_stack_depot_size = 0" into main am: 1f5b0f9fee am: ↵Treehugger Robot
b5d7105c22 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2858490 Change-Id: If6d93824a07264becc2debf2f27da779ac7c3ca6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Snap for 11206181 from 3a9ecb09bb20171cd4ead0c41871f6bb2d23913d to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: If8a92d8f6d1786ae985aa13e32959b0961ae5b19
2023-12-12Merge "Support batch writes for non-compressed ops" into main am: 314818029cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2863806 Change-Id: I8030e0dc6c121efdc7740a68a7d2058476627706 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Handle scudo_stack_depot_size = 0" into main am: 1f5b0f9feeTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2858490 Change-Id: I2068d1baad5dec10e4c17d5b3406bc73dc4cf0cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Support batch writes for non-compressed ops" into mainTreehugger Robot
2023-12-12Merge "Handle scudo_stack_depot_size = 0" into mainTreehugger Robot
2023-12-12Merge "fastboot: fix network connected device status" into main am: ↵Treehugger Robot
dcf3542d43 am: 541f064d68 am: 21c06513fb Original change: https://android-review.googlesource.com/c/platform/system/core/+/2866934 Change-Id: I915ba0a59d5ab044b4af2b0f2342309a36977df3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Merge "Use scudo_stack_depot_size from process_info" into main am: ↵Florian Mayer
f9566853bd am: 6256ea799e am: 07221e9f7b Original change: https://android-review.googlesource.com/c/platform/system/core/+/2858388 Change-Id: Icd3b4c12b963d8323151b327c22c0bf8d046c404 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-05-17 10:00:29 +0000