diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-03 01:35:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-03 01:35:25 +0000 |
| commit | 7b6b9809c92b6a49f43a690d763611bb3814e581 (patch) | |
| tree | 6f4acaa3f9a908c3bcb5f46404a9b44cdccf0fd5 | |
| parent | 877b5d4e420d0027e9373495e37e88dd9085cb28 (diff) | |
| parent | 8c14f41847e442d378209b04dbf44862d2c37804 (diff) | |
| download | core-7b6b9809c92b6a49f43a690d763611bb3814e581.tar.gz | |
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>
| -rw-r--r-- | fs_mgr/libsnapshot/snapshot_test.cpp | 2 |
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(); |