ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e am: 8c14f41847 am: 7b6b9809c9

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

Change-Id: Ie44eb26eec924c65906fb21437ac54dee03e8839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker 2023-06-03 02:22:18 +00:00
commit a0caaae440
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -315,7 +315,7 @@ class SnapshotTest : public ::testing::Test {
} }
AssertionResult DeleteDevice(const std::string& device) { AssertionResult DeleteDevice(const std::string& device) {
if (!dm_.DeleteDeviceIfExists(device)) { if (!sm->DeleteDeviceIfExists(device, 1s)) {
return AssertionFailure() << "Can't delete " << device; return AssertionFailure() << "Can't delete " << device;
} }
return AssertionSuccess(); return AssertionSuccess();