Commit 8c14f418 authored Jun 03, 2023 by Automerger Merge Worker

Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into...

Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d" into android13-tests-dev am: 0412ff9c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246

Change-Id: I1e0675c9a4eea8d078be9831376bc68089bd078c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/libsnapshot/snapshot_test.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();