commit 9931db7e59624271953ad0a08bdfc24d3125bb16
author Sudheer Shanka <sudheersai@google.com> Fri Sep 28 23:49:51 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 28 23:49:51 2018 +0000
tree 8d104a88382d0fe1af8d04574975e13a56fce7fe
parent a64572431e614a4f695bc3ba4b7daaa390b5fe70
parent 99d304ac6076b55c24a3391d00a44324ee0cc08e

Merge "Remove unmount_tree in VolumeManager."

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index db47e4d..cbe3187 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -410,10 +410,6 @@
     return 0;
 }
 
-static int unmount_tree(const std::string& prefix) {
-    return android::vold::UnmountTree(prefix);
-}
-
 int VolumeManager::remountUid(uid_t uid, const std::string& mode) {
     LOG(DEBUG) << "Remounting " << uid << " as mode " << mode;
 
@@ -483,7 +479,7 @@
                 _exit(1);
             }
 
-            unmount_tree("/storage/");
+            android::vold::UnmountTree("/storage/");
 
             std::string storageSource;
             if (mode == "default") {