From c51f1f994ada7b46224f672481c0dacf3894c70b Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Thu, 20 Sep 2012 15:32:13 -0400 Subject: Various fixes Modify AOSP mount and wipe functions to use Partition Manager. Update wipe code to reset the log file index when wiping cache. Add ADB sideload to 540x960 theme. --- roots.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'roots.cpp') diff --git a/roots.cpp b/roots.cpp index 69c98fc1d..9cbaa499a 100644 --- a/roots.cpp +++ b/roots.cpp @@ -29,6 +29,7 @@ extern "C" { #include "roots.h" #include "common.h" #include "make_ext4fs.h" +#include "partitions.hpp" static int num_volumes = 0; static Volume* device_volumes = NULL; @@ -142,6 +143,10 @@ Volume* volume_for_path(const char* path) { } int ensure_path_mounted(const char* path) { + if (PartitionManager.Mount_By_Path(path, true)) + return 0; + else + return -1; Volume* v = volume_for_path(path); if (v == NULL) { LOGE("unknown volume for path [%s]\n", path); @@ -202,6 +207,10 @@ int ensure_path_mounted(const char* path) { } int ensure_path_unmounted(const char* path) { + if (PartitionManager.UnMount_By_Path(path, true)) + return 0; + else + return -1; Volume* v = volume_for_path(path); if (v == NULL) { LOGE("unknown volume for path [%s]\n", path); @@ -230,6 +239,10 @@ int ensure_path_unmounted(const char* path) { } int format_volume(const char* volume) { + if (PartitionManager.Wipe_By_Path(volume)) + return 0; + else + return -1; Volume* v = volume_for_path(volume); if (v == NULL) { LOGE("unknown volume \"%s\"\n", volume); -- cgit v1.2.3