| commit | a0caaae440f96205ebfc436451c68851972c91f7 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 03 02:22:18 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 03 02:22:18 2023 +0000 |
| tree | cff7161826de2d77aa5da45930e0c86b947c4cea | |
| parent | 0cd04f09970dc8abfbfe6d971e3fc35540ddc47b [diff] | |
| parent | 7b6b9809c92b6a49f43a690d763611bb3814e581 [diff] |
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>
diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp index a741134..bf630f5 100644 --- a/fs_mgr/libsnapshot/snapshot_test.cpp +++ b/fs_mgr/libsnapshot/snapshot_test.cpp
@@ -315,7 +315,7 @@ } AssertionResult DeleteDevice(const std::string& device) { - if (!dm_.DeleteDeviceIfExists(device)) { + if (!sm->DeleteDeviceIfExists(device, 1s)) { return AssertionFailure() << "Can't delete " << device; } return AssertionSuccess();