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

Commit 53787d5f authored by Alexei Nicoara's avatar Alexei Nicoara Committed by Android (Google) Code Review
Browse files

Merge "Disabling RescueParty flag resets on master branch."

parents 942f3ef6 dbd7dec6
Loading
Loading
Loading
Loading
+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