Merge "add rebootWipeCache call to RecoverySystem API"

3 files changed, 5 insertions, 17 deletions

diff --git a/api/current.txt b/api/current.txt
index b462695..a9aaf38 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14434,6 +14434,7 @@ package android.os {
   public class RecoverySystem {
     ctor public RecoverySystem();
     method public static void installPackage(android.content.Context, java.io.File) throws java.io.IOException;
+    method public static void rebootWipeCache(android.content.Context) throws java.io.IOException;
     method public static void rebootWipeUserData(android.content.Context) throws java.io.IOException;
     method public static void verifyPackage(java.io.File, android.os.RecoverySystem.ProgressListener, java.io.File) throws java.security.GeneralSecurityException, java.io.IOException;
   }
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index ae605fb..73e8d98 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -357,20 +357,11 @@ public class RecoverySystem {
     }
 
     /**
-     * Reboot into the recovery system to wipe the /data partition and toggle
-     * Encrypted File Systems on/off.
-     * @param extras to add to the RECOVERY_COMPLETED intent after rebooting.
+     * Reboot into the recovery system to wipe the /cache partition.
      * @throws IOException if something goes wrong.
-     *
-     * @hide
      */
-    public static void rebootToggleEFS(Context context, boolean efsEnabled)
-        throws IOException {
-        if (efsEnabled) {
-            bootCommand(context, "--set_encrypted_filesystem=on");
-        } else {
-            bootCommand(context, "--set_encrypted_filesystem=off");
-        }
+    public static void rebootWipeCache(Context context) throws IOException {
+        bootCommand(context, "--wipe_cache");
     }
 
     /**
diff --git a/services/java/com/android/server/MasterClearReceiver.java b/services/java/com/android/server/MasterClearReceiver.java
index bdb5a24..86f57d1 100644
--- a/services/java/com/android/server/MasterClearReceiver.java
+++ b/services/java/com/android/server/MasterClearReceiver.java
@@ -43,11 +43,7 @@ public class MasterClearReceiver extends BroadcastReceiver {
             @Override
             public void run() {
                 try {
-                    if (intent.hasExtra("enableEFS")) {
-                        RecoverySystem.rebootToggleEFS(context, intent.getBooleanExtra("enableEFS", false));
-                    } else {
-                        RecoverySystem.rebootWipeUserData(context);
-                    }
+                    RecoverySystem.rebootWipeUserData(context);
                     Log.wtf(TAG, "Still running after master clear?!");
                 } catch (IOException e) {
                     Slog.e(TAG, "Can't perform master clear/factory reset", e);