commit 415d99dd2088c405fce9971f10082fbfd2e47261
author Zim <zezeozue@google.com> Mon Jun 29 19:50:47 2020 +0100
committer Zim <zezeozue@google.com> Tue Jun 30 21:59:46 2020 +0100
tree b70969db157c28fe8cf950dfae9c921016683b0f
parent 1aaa9af01f2de4da419bb79eeb8a164a146c051d

Remove persist.sys.fuse == false code paths

Since Android R, the FUSE prop is always on and FUSE-off is no longer
supported

Test: m
Bug: 160159282
Change-Id: Ic4414b850511fe3b4fc6df3f8b736d21335db820

VolumeManager.h

diff --git a/VolumeManager.h b/VolumeManager.h
index 3277f75..23a7fe0 100644
--- a/VolumeManager.h
+++ b/VolumeManager.h
@@ -115,9 +115,7 @@
     void createPendingDisksIfNeeded();
     int onSecureKeyguardStateChanged(bool isShowing);
 
-    int setPrimary(const std::shared_ptr<android::vold::VolumeBase>& vol);
-
-    int remountUid(uid_t uid, int32_t remountMode);
+    int remountUid(uid_t uid, int32_t remountMode) { return 0; }
     int remountAppStorageDirs(int uid, int pid, const std::vector<std::string>& packageNames);
 
     /* Aborts all FUSE filesystems, in case the FUSE daemon is no longer up. */