Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a8c1106 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: Use SnapshotManager to delete devices." am: 3de2320e am:... 

Merge "libsnapshot: Use SnapshotManager to delete devices." am: 3de2320e am: 904e71d2 am: 504e5b29 am: 1cb029f5 am: 3ea825e0

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



Change-Id: I618d2ae8e99184e3199a75d70e067ba66a1b3de6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff8ef805 3ea825e0

fs_mgr/libsnapshot/snapshot_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,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();