Remove wipe battery stats garbage.

Add support for doing a true ext4 format of /data on /data/media devices.

Change-Id: Ie6706989705e4cf90d0be119c7ffc54b2191d198

1 files changed, 6 insertions, 1 deletions

diff --git a/roots.c b/roots.c
index d3dafcd8..401fb26b 100644
--- a/roots.c
+++ b/roots.c
@@ -341,6 +341,7 @@ int ensure_path_unmounted(const char* path) {
 }
 
 extern struct selabel_handle *sehandle;
+static int handle_data_media = 0;
 
 int format_volume(const char* volume) {
     Volume* v = volume_for_path(volume);
@@ -356,7 +357,7 @@ int format_volume(const char* volume) {
     }
     // check to see if /data is being formatted, and if it is /data/media
     // Note: the /sdcard check is redundant probably, just being safe.
-    if (strstr(volume, "/data") == volume && is_data_media()) {
+    if (strstr(volume, "/data") == volume && is_data_media() && !handle_data_media) {
         return format_unknown_device(NULL, volume, NULL);
     }
     if (strcmp(v->fs_type, "ramdisk") == 0) {
@@ -415,3 +416,7 @@ int format_volume(const char* volume) {
 #endif
     return format_unknown_device(v->device, volume, v->fs_type);
 }
+
+void handle_data_media_format(int handle) {
+  handle_data_media = handle;
+}