Merge "Remove unmount_tree in VolumeManager." am: 9931db7e59 am: 96707825f2

am: 65eac7fc1a

Change-Id: I40174a2504b376ebce6962f23ce1e06b7d2c1666

VolumeManager.cpp

@@ -967,10 +967,6 @@ int VolumeManager::setPrimary(const std::shared_ptr<android::vold::VolumeBase>&
     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) {
     // If the isolated storage is enabled, return -1 since in the isolated storage world, there
     // are no longer any runtime storage permissions, so this shouldn't be called anymore.
@@ -1045,7 +1041,7 @@ int VolumeManager::remountUid(uid_t uid, const std::string& mode) {
                 _exit(1);
             }
 
-            unmount_tree("/storage/");
+            android::vold::UnmountTree("/storage/");
 
             std::string storageSource;
             if (mode == "default") {