Commit graph

82994 commits

Author SHA1 Message Date
Suren Baghdasaryan
547e14de57 libprocessgroup: fix reset of file_v2_name am: 72254810d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24271775

Change-Id: I36800e066ce74f7b84161451a01a37da08f9e002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:24:09 +00:00
Suren Baghdasaryan
72254810d9 libprocessgroup: fix reset of file_v2_name
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 2ffbeaef3a)
2023-07-31 22:32:30 +00:00
Stephen Crane
209890c07d storageproxyd: Start only a single binder thread
We only need a single binder thread to receive notifications, so we
should set the thread pool max to 0 rather than 1. startThreadPool()
starts one thread + the max count.

Test: m storageproxyd
Bug: 281951047
Fixes: 292030372
(cherry picked from https://android-review.googlesource.com/q/commit:b05b8706714a6e7eb64890e0bee012dbc69f72be)
Merged-In: I53a90eaa2aa69469fd3a00b6da0d7061318c8ba9

Change-Id: I53a90eaa2aa69469fd3a00b6da0d7061318c8ba9
2023-07-21 22:53:01 +00:00
Stephen Crane
1310d7a6d6 storageproxyd: Start binder thread pool
The Trusty storage proxy requires that the suspend service is started to
acquire a wakelock for UFS RPMB operations. Without the binder thread
pool running, starting this service results in at least a 1s polling
delay. This change ensures that we start the thread pool before handling
any RPMB operations, so acquiring the wakelock will complete as soon as
the service is ready without needing to poll once per second.

Test: m storageproxyd
Test: Artificially delay suspend_service to check if we poll
Bug: 281951047
(cherry picked from https://android-review.googlesource.com/q/commit:fb92cd3c22980e6ee6574be193f8ec993d19b2bf)
Merged-In: I1a4cdd48d57201b0cf9c24523d22e5bdbcea376a
Change-Id: I1a4cdd48d57201b0cf9c24523d22e5bdbcea376a
2023-07-20 18:58:00 +00:00
Paul Lawrence
3b7c081a97 Revert "Listen on property_service_for_system socket" am: be392fc693
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24028969

Change-Id: Ie58726764f8ed4d23b0f21b288773bd327096ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 16:52:00 +00:00
Paul Lawrence
abc6e1240d Revert "Fix deadlock caused by two-threaded property controls" am: 3196be61fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24028968

Change-Id: I7289b8597a48f2be35484fd339fa6d6d66b10f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 16:51:58 +00:00
Paul Lawrence
be392fc693 Revert "Listen on property_service_for_system socket"
This reverts commit 90879edeea.

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-11 14:01:01 -07:00
Paul Lawrence
3196be61fc Revert "Fix deadlock caused by two-threaded property controls"
This reverts commit 606afc7b74.

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-11 13:57:19 -07:00
Daeho Jeong
d7de52d721 init.rc: set f2fs seq_file_ra_mul to 128
Based on experiments, we fount out 128 (128 x global readahead window
size = 16mb) is the optimal multiple to boost up read speeds for the
sequentially accessed files with POSIX_FADV_SEQUENTIAL.

Bug: 195311558
Test: check the /sys/fs/f2fs/<userdata partition>/seq_file_ra_mul value
Merged-In: I7563ad6e47b9ab76ae7fe36978d0e5970a7490e8
Change-Id: I7563ad6e47b9ab76ae7fe36978d0e5970a7490e8
Signed-off-by: Daeho Jeong <daehojeong@google.com>
2023-07-06 17:41:51 +00:00
David Anderson
1a626643c1 Merge "ueventd: Fix a race condition in handling device-mapper events." into udc-dev am: c742bfda6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23598091

Change-Id: I22b5bb96a54c91ab124377a69ee53616c6eba018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 16:16:52 +00:00
David Anderson
1ae6f6c94d Merge "vts_fs_test: Relax filesystem constraints for fixed partitions." into udc-dev am: 7f5512dcd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23597911

Change-Id: I8463a2cf98fd1b58b41dd6c488626cc670562349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 16:15:32 +00:00
David Anderson
c742bfda6b Merge "ueventd: Fix a race condition in handling device-mapper events." into udc-dev 2023-06-08 15:29:50 +00:00
David Anderson
7f5512dcd0 Merge "vts_fs_test: Relax filesystem constraints for fixed partitions." into udc-dev 2023-06-08 15:23:39 +00:00
Automerger Merge Worker
f99938c88d [automerger skipped] Merge "Merge "Merge "libcutils_test: static libjsoncpp" 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: I87b0e8079939f83d67b8bee41b05bb8057eb78e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 01:15:41 +00:00
Automerger Merge Worker
7fc23ac750 Merge "Merge "Merge "libcutils_test: static libjsoncpp" into 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: Iecbb96e2ec8763ddb362f266f4aec6f107958980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 01:15:24 +00:00
Automerger Merge Worker
aa42e3d158 [automerger skipped] Merge "Merge "Merge "libcutils_test: static libjsoncpp" 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-08 01:13:39 +00:00
Automerger Merge Worker
4e9b58603e Merge "Merge "Merge "libcutils_test: static libjsoncpp" into 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-08 00:32:12 +00:00
Automerger Merge Worker
203d050e41 Merge "Merge "Merge "libcutils_test: static libjsoncpp" into 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-08 00:29:32 +00:00
Automerger Merge Worker
1f80c8bfbf Merge "Merge "Merge "libcutils_test: static libjsoncpp" into 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-07 23:49:19 +00:00
Automerger Merge Worker
2d9d60a93d Merge "Merge "Merge "libcutils_test: static libjsoncpp" into 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-07 23:48:06 +00:00
Automerger Merge Worker
1400b2dcaa Merge "Merge "Merge "libcutils_test: static libjsoncpp" into 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>
2023-06-07 23:01:42 +00:00
Automerger Merge Worker
2520bfb0d9 Merge "Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev 2023-06-07 22:18:20 +00:00
Automerger Merge Worker
b30ffaea19 Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475

Change-Id: Ia1640c6f62b2c3260620a775a439e5dbd715c9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 22:18:18 +00:00
Automerger Merge Worker
50cac03f37 Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev 2023-06-07 21:59:14 +00:00
Treehugger Robot
0b3153f9c0 Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475

Change-Id: I80baf972eba778b21195028782a2cf63fc7b85f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 21:59:11 +00:00
Treehugger Robot
9825551dbf Merge "libcutils_test: static libjsoncpp" into android12-tests-dev 2023-06-07 21:25:59 +00:00
David Anderson
4866d284f8 ueventd: Fix a race condition in handling device-mapper events.
We've had flake in libdm_test for a long time, with no clear cause.
Lately however it has become particularly reproducible when running
the UeventAfterLoadTable test in isolation, and thus we've identified
the root cause.

uevents for device-mapper are fired when the sysfs node is added, but at
that time, the "dm" subnode has not yet been added. The root node and dm
node are added very close together, so usually it works, but sometimes
ueventd is too fast.

Instead of relying on sysfs, query the uuid/name node directly from
device-mapper.

Bug: 286011429
Test: libdm_test
(cherry picked from https://android-review.googlesource.com/q/commit:59abbfe64706a7ea0c4e932ae40bc8bde9746dce)
Merged-In: I258de5de05d813c3cb7f129e82e56dbfe8bf3117

Change-Id: I85e240807e0ce5ade211ec65453ab06d4066992a
2023-06-06 21:37:09 -07:00
David Anderson
e55e3dcd3f vts_fs_test: Relax filesystem constraints for fixed partitions.
Adjust this test to align with VSR. First, skip the test if kernel is
< 5.10 or < Android 13. Second, allow non-dynamic partitions to be vfat.

Bug: 286038059
Test: vts_fs_test on CF
(cherry picked from https://android-review.googlesource.com/q/commit:084c94e43eb2916c84c72de524c6e8c3d5ec2d4f)
Merged-In: I5bd874f68296f7155d8c4366ebc13fe3d59c3ee6
Change-Id: I5bd874f68296f7155d8c4366ebc13fe3d59c3ee6
2023-06-07 04:15:19 +00:00
Steven Moreland
447b4a4bf0 libcutils_test: static libjsoncpp
The 32-bit variant of libjsoncpp is not always installed
on 64-bit devices, so it must always be statically included.

We should probably collapse libcutils_test with
libcutils_test_static in the future.

Bug: 285357054
Test: libcutils_test
Merged-In: Ic84901ce5af766338b2cab07c3cf10841ba9a150
Change-Id: Ic84901ce5af766338b2cab07c3cf10841ba9a150
2023-06-06 17:54:52 +00:00
Automerger Merge Worker
29fcec2c1f [automerger skipped] Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e am: 8c14f41847 am: 7b6b9809c9 am: a0caaae440 -s ours am: 34d2ae6aa5 -s ours
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 c786b6d332 is already in history

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

Change-Id: I3df523e96035f4d7790f5a64d9ad200aa7f8c96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 03:06:00 +00:00
Automerger Merge Worker
b64701c67b [automerger skipped] Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours am: f2dac32dcd -s ours am: 877b5d4e42 -s ours am: 0cd04f0997 -s ours am: a73bd28727 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I078ec06e1a9709accbea2398acbbf9cf8f12159a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 03:05:54 +00:00
Treehugger Robot
1bfbf8d9af [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours am: fcfa292007 -s ours am: 449989808c -s ours am: 2ad3138ff9 -s ours am: 54d24462ab -s ours am: 3883656058 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I8f7e86357e806fa34a18ba2c17a9fd574f9d2b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 03:05:53 +00:00
Automerger Merge Worker
b1a00e1844 [automerger skipped] Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e am: 8c14f41847 am: 3d5968b7a0 -s ours am: bd4825574c -s ours
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 e02ef9e9ce is already in history

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

Change-Id: Idb0e736d5993d7d07df6527e8a353e96fd6e6dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 03:05:33 +00:00
Automerger Merge Worker
9d83da6bb5 [automerger skipped] Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours am: f2dac32dcd -s ours am: 7ea7f55be3 -s ours am: d7bfc7024e -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: Ibd161dc615c0b8baa5f9a458df45a14bd64798fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 03:05:07 +00:00
Treehugger Robot
9d311ea620 [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours am: fcfa292007 -s ours am: 449989808c -s ours am: 839dca6a4b -s ours am: b4fecb926e -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I9f54c31480f529106408a6a19cd8b677b0f7b615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 03:05:05 +00:00
Automerger Merge Worker
34d2ae6aa5 [automerger skipped] Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e am: 8c14f41847 am: 7b6b9809c9 am: a0caaae440 -s ours
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 c786b6d332 is already in history

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

Change-Id: I4008c84a91749c8fcb1fb6cfb924785f2d6daa8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 03:03:56 +00:00
Automerger Merge Worker
a73bd28727 [automerger skipped] Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours am: f2dac32dcd -s ours am: 877b5d4e42 -s ours am: 0cd04f0997 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I44038c64fdb82509ffb4a7073b0ec7ac2497709c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 03:03:44 +00:00
Treehugger Robot
3883656058 [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours am: fcfa292007 -s ours am: 449989808c -s ours am: 2ad3138ff9 -s ours am: 54d24462ab -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I453d4cb38ed881c7a3e252a538f6482a86866840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 03:03:42 +00:00
Automerger Merge Worker
a0caaae440 Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e am: 8c14f41847 am: 7b6b9809c9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246

Change-Id: Ie44eb26eec924c65906fb21437ac54dee03e8839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 02:22:18 +00:00
Automerger Merge Worker
0cd04f0997 [automerger skipped] Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours am: f2dac32dcd -s ours am: 877b5d4e42 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: Ibb89bc08d8d47e0e2b0d7e545fff9ac21c4514b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 02:21:49 +00:00
Treehugger Robot
54d24462ab [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours am: fcfa292007 -s ours am: 449989808c -s ours am: 2ad3138ff9 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I4a28bf132f9a59a45e80224fa40c56f0647e1de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 02:21:48 +00:00
Automerger Merge Worker
bd4825574c [automerger skipped] Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e am: 8c14f41847 am: 3d5968b7a0 -s ours
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 e02ef9e9ce is already in history

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

Change-Id: I793fc3b2184ef106766daac5ec0b2648a06b8937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 02:18:38 +00:00
Automerger Merge Worker
d7bfc7024e [automerger skipped] Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours am: f2dac32dcd -s ours am: 7ea7f55be3 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: Id105ab288006b9050a037f5e079d725c08635f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 02:18:26 +00:00
Treehugger Robot
b4fecb926e [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours am: fcfa292007 -s ours am: 449989808c -s ours am: 839dca6a4b -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: Id754dbe20a5014380d2e6ea279d8c34771a023e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 02:18:24 +00:00
Automerger Merge Worker
7b6b9809c9 Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e am: 8c14f41847
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246

Change-Id: I824da9a2f4b5f87777c125fe74aa2d9aac57290b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:35:25 +00:00
Automerger Merge Worker
877b5d4e42 [automerger skipped] Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours am: f2dac32dcd -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I9d46b3a18d796ece7098cb7b9ec6909293443f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:34:57 +00:00
Treehugger Robot
2ad3138ff9 [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours am: fcfa292007 -s ours am: 449989808c -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I1b0c76ea8ea85f6a016cafa24c0695fbd153ae9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:34:57 +00:00
Automerger Merge Worker
3d5968b7a0 Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e am: 8c14f41847
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246

Change-Id: I2b4d2d9a45ae54cdad553ec58aa93a6610961d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:34:43 +00:00
Automerger Merge Worker
7ea7f55be3 [automerger skipped] Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours am: f2dac32dcd -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I6651fbb8b61d7c65e16324874621747b905295c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:34:11 +00:00
Treehugger Robot
839dca6a4b [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours am: fcfa292007 -s ours am: 449989808c -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: Id54735814b0d80faf052892cd4a3ee7574438b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:34:10 +00:00