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

Commit d67ab923 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Make SettingsProvider reset no-op for now. 

Something is funky with how settings are being reset, so disable it
for now.  We still eventually offer to reboot and wipe data.

Test: builds, boots
Bug: 34677175
Change-Id: Ied943a04d2a4bab8e5c77e622c56ebf6d4181393
parent 470ecb2c

services/core/java/com/android/server/RescueParty.java

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ public class RescueParty { 
    private static final int LEVEL_RESET_SETTINGS_TRUSTED_DEFAULTS = 3;

    private static final int LEVEL_FACTORY_RESET = 4;



    private static final boolean DISABLE_RESET_SETTINGS = true;



    /** Threshold for boot loops */

    private static final Threshold sBoot = new BootThreshold();

    /** Threshold for app crash loops */
@@ -151,6 +153,8 @@ public class RescueParty { 
    }



    private static void resetAllSettings(Context context, int mode) throws Exception {

        if (DISABLE_RESET_SETTINGS) return;



        // Try our best to reset all settings possible, and once finished

        // rethrow any exception that we encountered

        Exception res = null;