commit 761191a94ab46cad1926432e8a1a5bcd96c60d9f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 14 20:35:30 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 14 20:35:30 2024 +0000
tree 5245f13f49eb770736281aecb2bef27ca5bd5b19
parent f2a84dd8098cc7a2482b52ef9aa3981b9f584221
parent 9591fb4e659249410cebc6245cf4d634dbc631e0

Merge "Fix failure in CowTest#InvalidMergeOrderTest." into main am: 243850ca5f am: 9591fb4e65

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

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

fs_mgr/libsnapshot/libsnapshot_cow/test_v2.cpp

diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/test_v2.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/test_v2.cpp
index ce80cd7..b7bc2c8 100644
--- a/fs_mgr/libsnapshot/libsnapshot_cow/test_v2.cpp
+++ b/fs_mgr/libsnapshot/libsnapshot_cow/test_v2.cpp
@@ -1487,7 +1487,7 @@
     writer = std::make_unique<CowWriterV2>(options, GetCowFd());
     ASSERT_TRUE(writer->Initialize());
     ASSERT_TRUE(writer->AddCopy(2, 1));
-    ASSERT_TRUE(writer->AddXorBlocks(3, &data, data.size(), 1, 1));
+    ASSERT_TRUE(writer->AddXorBlocks(3, data.data(), data.size(), 1, 1));
     ASSERT_TRUE(writer->Finalize());
     ASSERT_TRUE(reader.Parse(cow_->fd));
     ASSERT_FALSE(reader.VerifyMergeOps());