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

Commit 549f7490 authored by Sanal Buvaev's avatar Sanal Buvaev Committed by Automerger Merge Worker
Browse files

Merge "Disabling RescueParty flag resets" into main am: feabe052 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2931490



Change-Id: I8b09b066de6f500eedc599f9900870e6c6621d15
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 610f44db feabe052

packages/CrashRecovery/services/java/com/android/server/RescueParty.java

+8 −0
Original line number Diff line number Diff line
@@ -382,6 +382,14 @@ public class RescueParty { 


    private static void executeRescueLevelInternal(Context context, int level, @Nullable

            String failedPackage) throws Exception {



        if (level <= LEVEL_RESET_SETTINGS_TRUSTED_DEFAULTS) {

            // Disabling flag resets on master branch for trunk stable launch.

            // TODO(b/287618292): Re-enable them after the trunk stable is launched and we

            // figured out a way to reset flags without interfering with trunk development.

            return;

        }



        FrameworkStatsLog.write(FrameworkStatsLog.RESCUE_PARTY_RESET_REPORTED, level);

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

        // rethrow any exception that we encountered