ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
82909 commits 1 branch 0 tags 217 MiB
Commit graph

82909 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Anderson
00a2190ec9 [automerger skipped] Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev am: 1264f39449 am: 86c54b73fc am: 5fdbc51871 -s ours am: 615c346e69 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2577014

Change-Id: I7ef299a05fb3f046b672889a0c42e899ec5fcb30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 21:26:36 +00:00
David Anderson
6202fa4633 [automerger skipped] DO NOT MERGE: libsnapshot: Fix test failures on certain configurations. am: 3f96053b38 am: c287a094af am: 258b82eadb -s ours am: 8afa6a8484 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2577014

Change-Id: I50eef09109ab7b6648fdde4eca5f901d3e3457b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 21:26:35 +00:00
David Anderson
615c346e69 [automerger skipped] Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev am: 1264f39449 am: 86c54b73fc am: 5fdbc51871 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2577014

Change-Id: I81ef425f90e296ae7f2fa1d91404c5b1c7b25f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 20:42:06 +00:00
David Anderson
8afa6a8484 [automerger skipped] DO NOT MERGE: libsnapshot: Fix test failures on certain configurations. am: 3f96053b38 am: c287a094af am: 258b82eadb -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2577014

Change-Id: I17af1b268ee56f313a04049ab6e4954f276530bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 20:42:04 +00:00
David Anderson
5fdbc51871 Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev am: 1264f39449 am: 86c54b73fc 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2577014

Change-Id: Iced98e6437c63a086bc2eafedafe6ef8f377a692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:57:54 +00:00
David Anderson
258b82eadb DO NOT MERGE: libsnapshot: Fix test failures on certain configurations. am: 3f96053b38 am: c287a094af 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2577014

Change-Id: I73722f3119bbc5026ab21ed1b0fc0c145ca1459d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:57:53 +00:00
David Anderson
86c54b73fc Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev am: 1264f39449 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2577014

Change-Id: I34a32d6b1a534a26b3e9f355b55df72e21a04d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:00:29 +00:00
David Anderson
c287a094af DO NOT MERGE: libsnapshot: Fix test failures on certain configurations. am: 3f96053b38 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2577014

Change-Id: Ib5a3310a0d0903240140455acc321db67c0258be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:00:27 +00:00
David Anderson
1264f39449 Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev 2023-05-17 18:22:26 +00:00
Bart Van Assche
5b4f07ad2f Revert "libprocessgroup: Add I/O scheduler attributes to task_profiles.json" am: 9fe0400080 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23221374

Change-Id: Ia7d18be6e89785b5a0b9c591ea0d3f02b1e2885f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-16 16:43:44 +00:00
Bart Van Assche
e5684a0770 Revert "Updating Attributes on task_profiles.json" am: f4a3d72ee8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23221373

Change-Id: I229999f9e1a07f33cc96aa0b7b52b9e5fa6a0a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-16 16:43:43 +00:00
Bart Van Assche
d3b46385f8 Revert "task_profiles.json: Convert tabs into spaces" am: 878406e7f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23221372

Change-Id: I3461f2464c8634178ae51d03985ac9d2b85a786e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-16 16:43:42 +00:00
Bart Van Assche
9fe0400080 Revert "libprocessgroup: Add I/O scheduler attributes to task_profiles.json" 
This reverts commit 9c0fcbb0f7.

Bug: 261857030
Ignore-AOSP-First: this change is for the U branch only.
Change-Id: Id4bd3494b33dd6bc0644406d599c9bfd597c7435
Signed-off-by: Bart Van Assche <bvanassche@google.com>
 2023-05-12 16:35:06 -07:00
Bart Van Assche
f4a3d72ee8 Revert "Updating Attributes on task_profiles.json" 
This reverts commit 92153fb955.

Bug: 261857030
Ignore-AOSP-First: this change is for the U branch only.
Change-Id: I99417707f0d0b8c7dca3927b6ce9d52436621f4e
Signed-off-by: Bart Van Assche <bvanassche@google.com>
 2023-05-12 16:35:01 -07:00
Bart Van Assche
878406e7f1 Revert "task_profiles.json: Convert tabs into spaces" 
This reverts commit 6ad747ac2d.

Bug: 261857030
Ignore-AOSP-First: this change is for the U branch only.
Change-Id: I93447b71146e6e9297ef49026d90dc4c35b91244
Signed-off-by: Bart Van Assche <bvanassche@google.com>
 2023-05-12 16:34:02 -07:00
Maciej Żenczykowski
3f0b887489 Merge "remove inprocess tethering" into udc-dev am: 65803e0327 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23090719

Change-Id: I08d3179441547fea0ec38851d7ed7d401fe82385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:54:33 +00:00
Maciej Żenczykowski
65803e0327 Merge "remove inprocess tethering" into udc-dev 2023-05-12 15:44:24 +00:00
Martin Stjernholm
c9686a2395 Run art_boot before odsign. am: 7c9c8f52e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23164806

Change-Id: Ifb3a8f4d148e012f9aa94bce362b6e905815e2b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 11:19:27 +00:00
Martin Stjernholm
7c9c8f52e7 Run art_boot before odsign. 
It's necessary to have the right dalvik.vm.* flags in place when they
are validated by odrefresh.

Test: See the other CL in the topic.
Bug: 281850017
Ignore-AOSP-First: Will cherry-pick to AOSP later
Change-Id: Ib64790dde97faaa6b62ead2c1c8dd53c97f97f9c
 2023-05-11 16:02:30 +01:00
Maciej Żenczykowski
778d7e80a6 remove inprocess tethering 
Test: TreeHugger
Bug: 279942846
(cherry picked from https://android-review.googlesource.com/q/commit:e37468b295851b97db07936e15f53af660607cb4)
Merged-In: Ia3a5d289cceac96d310e04fbae3588789cc859ca
Change-Id: Ia3a5d289cceac96d310e04fbae3588789cc859ca
 2023-05-08 21:16:00 +00:00
David Anderson
3f96053b38 DO NOT MERGE: libsnapshot: Fix test failures on certain configurations. 
Due to how CF is built and tested, VABC is enabled even when not
supported by the kernel. To work around this add some logic in
libsnapshot and the test harness to recognize this situation and
silently flip off the VABC flag.

This also fixes the -force_mode option to vts_libsnapshot_test, so that
it will skip tests that aren't supported by the device.

Bug: 264279496
Test: vts_libsnapshot_test on android13-gsi with 11-5.4 kernel
Change-Id: I9279d8d400cac5cd504a7ae91f254aae57fa856d
 2023-05-03 19:07:50 +00:00
Akilesh Kailash
3f24a8e769 libsnapshot: Turn off vabc_legacy_tests on presubmit am: ac9fbbcb05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/22977179

Change-Id: I34b57ba81aec2bf10d6a54b2ab92f5b0c49991c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 18:23:58 +00:00
Akilesh Kailash
ac9fbbcb05 libsnapshot: Turn off vabc_legacy_tests on presubmit 
Temporarily turn off these tests until root cause is found.

Bug: 279009697
Test: presubmit
Signed-off-by: Akilesh Kailash <akailash@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:defe8381aac9d461f6de8690b5917771b5f6752f)
Merged-In: I90f695fac318b71871ff60c1f74c90265437687d
Change-Id: I90f695fac318b71871ff60c1f74c90265437687d
 2023-05-02 22:09:32 +00:00
Vincent Donnefort
b82061556a [automerger skipped] ramdisk_node_list: Add urandom node am: e80a6b6dd4 -s ours 
am skip reason: Merged-In I111e2db53fabd63d070b8e9ab9c52faebf484ab3 with SHA-1 79ac2ad6d4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/22965416

Change-Id: Ife2c7f7bbf5ec3c703b24dc7957fbe87e7ab4947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 15:19:59 +00:00
Vincent Donnefort
e80a6b6dd4 ramdisk_node_list: Add urandom node 
Bionic requires random numbers to init the shadow call stack. Those
numbers are obtained via the syscall getrandom (non-blocking) and will
fallback to /dev/urandom if the former fails.

When loading pKVM modules, we are so early in the boot process that the
only source of entropy for the linux RNG are the architecture random
number generators... which might be available on some platforms. Without
any source of entropy, the only way of generating a random number is to
try to generate some, which is what the bionic fallback expects via
urandom.

As a consequence, add the urandom node to the initramfs.

Bug: 274876849
Merged-In: I111e2db53fabd63d070b8e9ab9c52faebf484ab3
Change-Id: I34a0e3f7c72de7344512366d4a96183b445edc2e
 2023-05-02 09:48:21 +00:00
Suren Baghdasaryan
50395c740d libprocessgroup: implement task profile validity checks am: 4a8c1461ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/22919937

Change-Id: I7d737cd6017ca9a54dd4c2571b32e8112dcaad40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 07:57:38 +00:00
Suren Baghdasaryan
4a8c1461ff libprocessgroup: implement task profile validity checks 
Provide profile validity check functions for cases when user wants to
check whether a profile can be successfully applied before actually
applying it. Add test cases to cover new APIs.

Also add a wrapper function for framework code to call it.

Bug: 277233783
Test: atest task_profiles_test
Test: manually verify freezer with outdated cgroup configuration
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Li Li <dualli@google.com>
Change-Id: Iefb321dead27adbe67721972f164efea213c06cb
Merged-In: Iefb321dead27adbe67721972f164efea213c06cb
 2023-05-01 11:51:31 -07:00
Christopher Ferris
b115b065cb Merge "Re-add code to skip gettings logs on logd crashes." into udc-dev am: da10417125 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/22897363

Change-Id: If621f0795540ddea52b23d6dfae1b7b9e8b02083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 01:20:31 +00:00
Christopher Ferris
da10417125 Merge "Re-add code to skip gettings logs on logd crashes." into udc-dev 2023-04-27 00:51:04 +00:00
Automerger Merge Worker
f6833db67b Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev am: 5658f34653 am: 5f2eb20c94 am: e755101e9e am: 2064e9397a am: fc6633c303 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: I7d10f181407499d7eb6bf769c9dc25676facf7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 19:42:41 +00:00
Automerger Merge Worker
3d6ee1ec6c [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours am: 51349daf08 -s ours am: ab913fe979 -s ours am: 1b6291a3c2 -s ours am: fa5640a8fa -s ours am: 6fb1d54d05 -s ours 
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: I3865b1456f1ce79b20385f5f65754c4cb59e902f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 19:42:39 +00:00
Automerger Merge Worker
fc6633c303 Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev am: 5658f34653 am: 5f2eb20c94 am: e755101e9e am: 2064e9397a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: Id8c03e62c3f223cf83c624c7e3a44e179f0ce3bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 19:41:55 +00:00
Automerger Merge Worker
6fb1d54d05 [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours am: 51349daf08 -s ours am: ab913fe979 -s ours am: 1b6291a3c2 -s ours am: fa5640a8fa -s ours 
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: Icdd09a55cc8e5f56f591162c51b9eb68e3e0c279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 19:41:51 +00:00
Automerger Merge Worker
ce9ae1aae4 Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev am: 5658f34653 am: 5f2eb20c94 am: 3a3dc70496 am: 6140a0ae58 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: Ifc30614cdf6435cde7ec70a017b64fd8f50577c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 19:41:34 +00:00
Automerger Merge Worker
76e9867bd2 [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours am: 51349daf08 -s ours am: ab913fe979 -s ours am: 0ce6dfc29b -s ours am: 0b83b6164d -s ours 
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: If4ba46a4c399f6278126f5dc43fdf9ef5adbd3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 19:41:32 +00:00
Automerger Merge Worker
2064e9397a Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev am: 5658f34653 am: 5f2eb20c94 am: e755101e9e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: I9864873bf7362c9fd9c7bd1faa963d52d4da9c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 18:57:01 +00:00
Automerger Merge Worker
fa5640a8fa [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours am: 51349daf08 -s ours am: ab913fe979 -s ours am: 1b6291a3c2 -s ours 
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: Ia8421e84ebb896ca1fc48ac17b7f94ede9481fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 18:56:59 +00:00
Automerger Merge Worker
6140a0ae58 Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev am: 5658f34653 am: 5f2eb20c94 am: 3a3dc70496 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: I104ed4ed8f34ea2e104ccb7ceea03f4ce5f7286a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 18:54:57 +00:00
Automerger Merge Worker
0b83b6164d [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours am: 51349daf08 -s ours am: ab913fe979 -s ours am: 0ce6dfc29b -s ours 
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: Iae222133f6aca750f919f12b17e51ddf8dc59b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 18:54:54 +00:00
Automerger Merge Worker
e755101e9e Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev am: 5658f34653 am: 5f2eb20c94 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: I0023fbab9c72348714f4fea1d6c4fb07ad691fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 18:13:22 +00:00
Automerger Merge Worker
1b6291a3c2 [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours am: 51349daf08 -s ours am: ab913fe979 -s ours 
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: I451f0ca23524448306ed399fa671bfd5773211ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 18:13:20 +00:00
Automerger Merge Worker
3a3dc70496 Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev am: 5658f34653 am: 5f2eb20c94 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: I0ab3d6009f2cc39c3a96e96fb604d07c9d552c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 18:12:41 +00:00
Automerger Merge Worker
0ce6dfc29b [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours am: 51349daf08 -s ours am: ab913fe979 -s ours 
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: I383424667a119afdced42a47e888f8aaa04b0a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 18:12:39 +00:00
Automerger Merge Worker
5f2eb20c94 Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev am: 5658f34653 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: Ib9046976f60bdcf354530c146fcdb8dff9e8a90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 17:45:27 +00:00
Automerger Merge Worker
ab913fe979 [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours am: 51349daf08 -s ours 
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: I7575285c98982b37280010fdad4e3cad63aca518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 17:45:20 +00:00
Automerger Merge Worker
5658f34653 Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours" into android13-tests-dev 2023-04-26 17:05:37 +00:00
Automerger Merge Worker
51349daf08 [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev am: 5141eaf353 -s ours 
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: I1fdf41caf785e5149dbdea83a0e74f18db63886a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 17:04:31 +00:00
Automerger Merge Worker
5141eaf353 Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664" into android12L-tests-dev 2023-04-26 02:45:46 +00:00
Treehugger Robot
2316bf2eaf Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b880578664 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2563951

Change-Id: Iefd00dd6629a0850cffb7a4a170d8c831a7c2007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 02:45:43 +00:00
Treehugger Robot
b880578664 Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev 2023-04-26 02:13:15 +00:00