commit 9ea08bb1fa1876074ea8716a05222d76b85175a3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 30 18:14:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 30 18:14:40 2020 +0000
tree 1e64a732ffbca267b5ae80b113b679f004dee1ea
parent cf78f452edb8d802df0dacd6c8e70646207a8bcc
parent 163cf832a1b1410b7c0aeafa7a22c3184a56a7a1

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

Change-Id: Iad848705749bfcf5725f9532f00009517cb5355c

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