Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33651201 authored by Doug Zongker's avatar Doug Zongker
Browse files

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
parent 7dde1c8c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -14432,6 +14432,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;

  }

core/java/android/os/RecoverySystem.java

+3 −12
Original line number Diff line number Diff line
@@ -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");

    }



    /**

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

+1 −5
Original line number Diff line number Diff line
@@ -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);

                    }

                    Log.wtf(TAG, "Still running after master clear?!");

                } catch (IOException e) {

                    Slog.e(TAG, "Can't perform master clear/factory reset", e);