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

Commit e2a8a579 authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov Committed by Automerger Merge Worker
Browse files

Merge "Enable SETTINGS_DO_NOT_RESTORE_PRESERVED by default" into rvc-dev am: 3a0df8a0 

Change-Id: I7626fc530fc625f07ecf40bf4ccc048d9534e1f9
parents c8d75a04 3a0df8a0

core/java/android/util/FeatureFlagUtils.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -67,9 +67,9 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put("settings_controller_loading_enhancement", "false");

        DEFAULT_FLAGS.put("settings_controller_loading_enhancement", "false");

        DEFAULT_FLAGS.put("settings_conditionals", "false");

        DEFAULT_FLAGS.put("settings_conditionals", "false");

        DEFAULT_FLAGS.put(NOTIF_CONVO_BYPASS_SHORTCUT_REQ, "true");

        DEFAULT_FLAGS.put(NOTIF_CONVO_BYPASS_SHORTCUT_REQ, "true");

        // Disabled by default until b/148278926 is resolved. This flags guards a feature

        // This flags guards a feature introduced in R and will be removed in the next release

        // introduced in R and will be removed in the next release (b/148367230).

        // (b/148367230).

        DEFAULT_FLAGS.put(SETTINGS_DO_NOT_RESTORE_PRESERVED, "false");

        DEFAULT_FLAGS.put(SETTINGS_DO_NOT_RESTORE_PRESERVED, "true");





        DEFAULT_FLAGS.put("settings_tether_all_in_one", "false");

        DEFAULT_FLAGS.put("settings_tether_all_in_one", "false");

        DEFAULT_FLAGS.put(SETTINGS_SCHEDULES_FLAG, "false");

        DEFAULT_FLAGS.put(SETTINGS_SCHEDULES_FLAG, "false");