commit 881397e8634ad0f95d6a0a5d8fde21902802985f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 30 18:22:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 30 18:22:05 2020 +0000
tree 1e64a732ffbca267b5ae80b113b679f004dee1ea
parent 6879c26d9e9f4ad11bd9ae3007fa386662f42ac3
parent 9ea08bb1fa1876074ea8716a05222d76b85175a3

Merge "fs_mgr: Fix MapScratchPartitionIfNeeded signature" am: 838b1a1f94 am: 9e3a7c41c2

Change-Id: If8ea1965dd3c596961e4d71c82c7a2bf54868209

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index ca19782..2bc53d3 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -113,8 +113,8 @@
 namespace android {
 namespace fs_mgr {
 
-void MapScratchPartitionIfNeeded(Fstab*, const std::function<bool(const std::string&)>&) {}
-
+void MapScratchPartitionIfNeeded(Fstab*,
+                                 const std::function<bool(const std::set<std::string>&)>&) {}
 }  // namespace fs_mgr
 }  // namespace android