Elliott Hughes
2cdc3fdecc
Merge "Remove obsolete <linux/capabilities.h> workarounds." into main am: b0bff22429 am: fd605f23d1 am: e8c6297e96 am: 7b986c5477
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2770138
Change-Id: Iba38a3fe57caf0a63a09fa9ab633ddfa14e7723e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 20:47:22 +00:00
Elliott Hughes
7b986c5477
Merge "Remove obsolete <linux/capabilities.h> workarounds." into main am: b0bff22429 am: fd605f23d1 am: e8c6297e96
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2770138
Change-Id: Ic878e7c2b6c18b60fe8ca1529e5c6846df8e35d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 19:59:41 +00:00
Elliott Hughes
e8c6297e96
Merge "Remove obsolete <linux/capabilities.h> workarounds." into main am: b0bff22429 am: fd605f23d1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2770138
Change-Id: I1b8ab6ea4664d6f0f1728fb4f69ecb24c185aec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 18:33:01 +00:00
Elliott Hughes
fd605f23d1
Merge "Remove obsolete <linux/capabilities.h> workarounds." into main am: b0bff22429
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2770138
Change-Id: I15862cbef6b2c0cdf0a70d2ba636a63b5e98c708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 16:25:38 +00:00
Elliott Hughes
b0bff22429
Merge "Remove obsolete <linux/capabilities.h> workarounds." into main
2023-10-02 15:09:26 +00:00
Treehugger Robot
803025ac9c
Merge "Adjust unit tests for supporting chain partition with no ab" into main am: b90cd3b5ab am: 63a7d5bcbf am: 6d52212e33 am: 9cf1900733
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765270
Change-Id: I2916a1ac52f838378708c897eeed89085c27ce85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 07:50:32 +00:00
Treehugger Robot
9cf1900733
Merge "Adjust unit tests for supporting chain partition with no ab" into main am: b90cd3b5ab am: 63a7d5bcbf am: 6d52212e33
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765270
Change-Id: Id3292c9a1005825cfeb0ba2d02b47a91d53fc42a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 07:02:44 +00:00
Treehugger Robot
6d52212e33
Merge "Adjust unit tests for supporting chain partition with no ab" into main am: b90cd3b5ab am: 63a7d5bcbf
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765270
Change-Id: I7029d6a0a0fb84ac6f86f3f85d5b233d6bb45f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 06:01:24 +00:00
Treehugger Robot
63a7d5bcbf
Merge "Adjust unit tests for supporting chain partition with no ab" into main am: b90cd3b5ab
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765270
Change-Id: I42ca902df13dd623561dcab721c73c45be153cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02 04:49:23 +00:00
Treehugger Robot
b90cd3b5ab
Merge "Adjust unit tests for supporting chain partition with no ab" into main
2023-10-02 03:28:37 +00:00
Elliott Hughes
7d46c3fd7a
Remove obsolete <linux/capabilities.h> workarounds.
...
We've updated the glibc header (and musl will just use the bionic uapi
headers), so this is obsolete (and getting in the way of someone trying
to use the PERFMON capability).
Test: treehugger
Change-Id: Ife7ee076179e1db6246738aa41c2b82bd8546265
2023-09-29 22:45:59 +00:00
Xin Li
ce2c75731b
[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: f43377946b -s ours am: 456368a115 -s ours am: bc75631cf4 -s ours
...
am skip reason: Merged-In I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 with SHA-1 1e81ee1363 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24880054
Change-Id: Ifb5bfb67564a30193c7f937ff4e045e8d772378c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 09:04:57 +00:00
Xin Li
75d2b2d0a0
[automerger skipped] Merge UP1A.231005.007 am: d4593eca5b -s ours am: 543dda5233 -s ours am: b807ea316a -s ours
...
am skip reason: Merged-In I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 with SHA-1 1e81ee1363 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24880054
Change-Id: Ib88fb7ae56732deb46745534eed937220594bd9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 09:04:32 +00:00
Xin Li
bc75631cf4
[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: f43377946b -s ours am: 456368a115 -s ours
...
am skip reason: Merged-In I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 with SHA-1 1e81ee1363 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24880054
Change-Id: If49d042dddcbd7f7194e1ffbda0cd2eee7ea3bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:55 +00:00
Xin Li
b807ea316a
[automerger skipped] Merge UP1A.231005.007 am: d4593eca5b -s ours am: 543dda5233 -s ours
...
am skip reason: Merged-In I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 with SHA-1 1e81ee1363 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24880054
Change-Id: I23bf3246b4d7037400d8b090c4aa6f2ea286fd97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:28 +00:00
Xin Li
456368a115
[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: f43377946b -s ours
...
am skip reason: Merged-In I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 with SHA-1 1e81ee1363 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24880054
Change-Id: Idd2b81caaea94bc54bcd002fd05805a7261fce25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:57 +00:00
Xin Li
543dda5233
[automerger skipped] Merge UP1A.231005.007 am: d4593eca5b -s ours
...
am skip reason: Merged-In I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 with SHA-1 1e81ee1363 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24880054
Change-Id: Icd117e536db7649ab8a7ad56f6d10d1f38534b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:38 +00:00
Xin Li
f43377946b
Merge "Merge UP1A.231005.007" into aosp-main-future
2023-09-29 06:40:58 +00:00
Treehugger Robot
1de10af40a
Merge "Add the missing copyright headers to the .S files." into main am: aadb2046fd am: 4e1a1f05a6 am: 7a8dc47b94 am: f642bfb60b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2767705
Change-Id: I4677534732c2051f2fdf48dea9ce61039b58b5ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 23:36:08 +00:00
Treehugger Robot
f642bfb60b
Merge "Add the missing copyright headers to the .S files." into main am: aadb2046fd am: 4e1a1f05a6 am: 7a8dc47b94
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2767705
Change-Id: I50d3c39a7be28c74e95fa908f313bd9ea6bdcf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 22:49:45 +00:00
Treehugger Robot
7a8dc47b94
Merge "Add the missing copyright headers to the .S files." into main am: aadb2046fd am: 4e1a1f05a6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2767705
Change-Id: I0c9400f0a2638466b11a69873b0b5650833ff0a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 21:48:12 +00:00
Treehugger Robot
3a16b65953
Merge "Keep fs_mgr_vendor_overlay_test in internal cf." into main am: ec74e27a61 am: 668c95919a am: 364cfe9642 am: 9b5887f10e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765988
Change-Id: I5e1c31e0c0cdfba72fea1951e35a2e636f7c5b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 21:32:22 +00:00
Treehugger Robot
9b5887f10e
Merge "Keep fs_mgr_vendor_overlay_test in internal cf." into main am: ec74e27a61 am: 668c95919a am: 364cfe9642
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765988
Change-Id: I4b9d4dd953351560d2fed977bb07855374c1ae24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 20:45:28 +00:00
Treehugger Robot
4e1a1f05a6
Merge "Add the missing copyright headers to the .S files." into main am: aadb2046fd
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2767705
Change-Id: If0e4e49aa1e5a9a9614c6c46b9702d357c657841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 20:41:25 +00:00
Treehugger Robot
aadb2046fd
Merge "Add the missing copyright headers to the .S files." into main
2023-09-28 20:13:37 +00:00
Treehugger Robot
364cfe9642
Merge "Keep fs_mgr_vendor_overlay_test in internal cf." into main am: ec74e27a61 am: 668c95919a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765988
Change-Id: Ied7832e63f727f71e1f6858a9b07b2a4cefab6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 19:45:27 +00:00
Treehugger Robot
668c95919a
Merge "Keep fs_mgr_vendor_overlay_test in internal cf." into main am: ec74e27a61
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765988
Change-Id: I8e861c8f49cb21acd45ef97c9009ccfb65658870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 18:22:23 +00:00
Elliott Hughes
041afb2883
Add the missing copyright headers to the .S files.
...
Dates taken from `git log --follow`.
Test: treehugger
Change-Id: I80e9ea6aa01f8e0553295453749afcbc3af827f9
2023-09-28 10:41:21 -07:00
Treehugger Robot
ec74e27a61
Merge "Keep fs_mgr_vendor_overlay_test in internal cf." into main
2023-09-28 17:13:01 +00:00
wuhaitao3
250aa5ed72
Adjust unit tests for supporting chain partition with no ab
...
Test: libfs_avb_internal_test
libfs_avb_test
Signed-off-by: wuhaitao3 <wuhaitao3@xiaomi.corp-partner.google.com>
Change-Id: I5f91510e72776ed2ed53756ae94a87b1417ae1a5
2023-09-28 11:19:55 +00:00
Dan Shi
69f57f98c5
Keep fs_mgr_vendor_overlay_test in internal cf.
...
Bug: 302382476
Change-Id: I369927033b407660d2c0e7bdb85494c826c0b406
Test: presubmit
2023-09-28 06:32:31 +00:00
Treehugger Robot
f118c59740
Merge "disable sync_on_suspend when flag is set" into main am: cfec879ad6 am: b5ce7aa444 am: 914f701ac0 am: 36bbb7d13c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762661
Change-Id: I9ab53fa82df5ed014579e5fb7dd45ae4ab800242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 03:46:42 +00:00
Treehugger Robot
36bbb7d13c
Merge "disable sync_on_suspend when flag is set" into main am: cfec879ad6 am: b5ce7aa444 am: 914f701ac0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762661
Change-Id: I6124a3edeccb4e63e585cee7efeb47862417a3e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 03:01:03 +00:00
Treehugger Robot
914f701ac0
Merge "disable sync_on_suspend when flag is set" into main am: cfec879ad6 am: b5ce7aa444
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762661
Change-Id: I5022eb94c59bb09719c0a30563cb76a8e206fe3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 01:59:47 +00:00
Treehugger Robot
b5ce7aa444
Merge "disable sync_on_suspend when flag is set" into main am: cfec879ad6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762661
Change-Id: I44e9af64a4562ede087007cfb19e070ad0ed3a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 00:52:03 +00:00
Treehugger Robot
cfec879ad6
Merge "disable sync_on_suspend when flag is set" into main
2023-09-28 00:03:50 +00:00
Xin Li
d4593eca5b
Merge UP1A.231005.007
...
Bug: 291102124
Merged-In: I02e3046bd85d0dfebc68ab444f1796bb54cc69c7
Change-Id: I1978b02276be8a1e7b272dbdb8e18347ef2c8aca
2023-09-27 16:05:23 -07:00
Daniel Zheng
38b085594c
Merge "Add copyright to libsnapshot/tools" into main am: 26bed5fc09 am: 1b53b83925 am: 8463e11b63 am: 24c6856254
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2763850
Change-Id: Iecbf6046acd5fc9804f0898c1bd028f517902594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 22:38:46 +00:00
Daniel Zheng
29cf5618fe
Merge "Add binary to write basic COW" into main am: 0fc7feeafb am: e42df43569 am: a37a965ccd am: 6daa94d796
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2763849
Change-Id: Ib280a68603b808f240abc40ce2fe37096f261e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 22:37:39 +00:00
Daniel Zheng
24c6856254
Merge "Add copyright to libsnapshot/tools" into main am: 26bed5fc09 am: 1b53b83925 am: 8463e11b63
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2763850
Change-Id: Ib35a53a0b8ede57e9690eb57b56d8b91df71fa83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 21:52:22 +00:00
Daniel Zheng
6daa94d796
Merge "Add binary to write basic COW" into main am: 0fc7feeafb am: e42df43569 am: a37a965ccd
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2763849
Change-Id: I941814ed00dc5ac54c80cc979b697fa38e2d7c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 21:51:58 +00:00
Daniel Zheng
8463e11b63
Merge "Add copyright to libsnapshot/tools" into main am: 26bed5fc09 am: 1b53b83925
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2763850
Change-Id: I5acd01a56c673399d4fb7ecf53ad0164ec6703fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:51:17 +00:00
Daniel Zheng
a37a965ccd
Merge "Add binary to write basic COW" into main am: 0fc7feeafb am: e42df43569
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2763849
Change-Id: Ie19360b1630f09b5e8c1e2adbd6c4e887c018f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:50:54 +00:00
Snehal Koukuntla
50aa99c39a
Merge "Remove ambgiuity in format specifier" into main am: 321f0989e5 am: a345e5a848 am: 30c57e0825 am: 724eb0086c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765005
Change-Id: Ifa8b85e561359795c6940e049e1224e31d2b4aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:36:05 +00:00
Tomasz Wasilczyk
3215825c35
Merge "Revert "Revert "Lock down String8|16.string() usage""" into main am: 8c9c7d076f am: 8703cb8ed6 am: 80ce21e6fd am: d4d78d41b7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2752223
Change-Id: Id130a4d1c08ae9d36c5b39775eefa80409dc4d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:35:19 +00:00
Snehal Koukuntla
724eb0086c
Merge "Remove ambgiuity in format specifier" into main am: 321f0989e5 am: a345e5a848 am: 30c57e0825
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2765005
Change-Id: Ife1b024a2805d8d3e0f4bff461661b11670a4b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:48:22 +00:00
Tomasz Wasilczyk
d4d78d41b7
Merge "Revert "Revert "Lock down String8|16.string() usage""" into main am: 8c9c7d076f am: 8703cb8ed6 am: 80ce21e6fd
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2752223
Change-Id: I2a7b95fb8a8b06ac2751da78c45c15b48e926be7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:46:48 +00:00
Daniel Zheng
1b53b83925
Merge "Add copyright to libsnapshot/tools" into main am: 26bed5fc09
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2763850
Change-Id: I868a1db6b5920a827aa60c375992a3f21895290a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:45:07 +00:00
Daniel Zheng
e42df43569
Merge "Add binary to write basic COW" into main am: 0fc7feeafb
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2763849
Change-Id: I57488d1893a80bf44e5c3b12ec6f014691329c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:44:16 +00:00
Daniel Zheng
26bed5fc09
Merge "Add copyright to libsnapshot/tools" into main
2023-09-27 18:39:00 +00:00