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 <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-06-03 00:20:57 +00:00 committed by Automerger Merge Worker
commit 4fc18600ac

View file

@ -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();