commit 33651201375d3670672964503994c410b8eeed7b
author Doug Zongker <dougz@android.com> Tue Jul 19 12:45:09 2011 -0700
committer Doug Zongker <dougz@android.com> Tue Jul 19 12:45:09 2011 -0700
tree 2350c67d93932b3bf274207a4db69ad41329bbe7
parent 7dde1c8ccce049378b8aa9e757b6f907040c8640

add rebootWipeCache call to RecoverySystem API

Also remove the never-used encrypted-filesystem-via-recovery stuff
that was stripped out of recovery a while ago.

Change-Id: I3349cba83daa9bc4765bd9b3f96d15000a801824

services/java/com/android/server/MasterClearReceiver.java

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 @@
             @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);