| commit | 4fc18600ac1582257b3cf2bd821590e4dae1ca0c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <[email protected]> | Sat Jun 03 00:20:57 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Sat Jun 03 00:20:57 2023 +0000 |
| tree | f14700aaaf286af00da4753dcad410ef78cb12ea | |
| parent | d42cd6887d70f220e1711719cdb47f90a9b9b5e3 [diff] | |
| parent | 11caad9d6c8ca8d849f3444857edb76bc3a91977 [diff] |
Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246 Change-Id: Ie667cac11be2ee5eef1cc7b434777689757c0a5a Signed-off-by: Automerger Merge Worker <[email protected]>
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();