summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-03 00:21:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-06-03 00:21:00 +0000
commit0412ff9c1e3e10677db888ab3b4f5a964ff83613 (patch)
treef14700aaaf286af00da4753dcad410ef78cb12ea
parentd42cd6887d70f220e1711719cdb47f90a9b9b5e3 (diff)
parent4fc18600ac1582257b3cf2bd821590e4dae1ca0c (diff)
downloadcore-0412ff9c1e3e10677db888ab3b4f5a964ff83613.tar.gz
Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev
-rw-r--r--fs_mgr/libsnapshot/snapshot_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp
index a741134b8..bf630f523 100644
--- a/fs_mgr/libsnapshot/snapshot_test.cpp
+++ b/fs_mgr/libsnapshot/snapshot_test.cpp
@@ -315,7 +315,7 @@ class SnapshotTest : public ::testing::Test {
}
AssertionResult DeleteDevice(const std::string& device) {
- if (!dm_.DeleteDeviceIfExists(device)) {
+ if (!sm->DeleteDeviceIfExists(device, 1s)) {
return AssertionFailure() << "Can't delete " << device;
}
return AssertionSuccess();