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

Commit 067e9b1a authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Clean Safetyhub feature flag." into qt-dev am: fe771523 am: da52c2ec"

parents 088107f1 943012b9

core/java/android/util/FeatureFlagUtils.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ public class FeatureFlagUtils { 
    public static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX;

    public static final String PERSIST_PREFIX = "persist." + FFLAG_OVERRIDE_PREFIX;

    public static final String SEAMLESS_TRANSFER = "settings_seamless_transfer";

    public static final String SEAMLESS_TRANSFER = "settings_seamless_transfer";

    public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

    public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

    public static final String SAFETY_HUB = "settings_safety_hub";

    public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";

    public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";

    public static final String FORCE_GLOBAL_ACTIONS_GRID_ENABLED =

    public static final String FORCE_GLOBAL_ACTIONS_GRID_ENABLED =

            "settings_global_actions_force_grid_enabled";

            "settings_global_actions_force_grid_enabled";
@@ -55,7 +54,6 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put(DYNAMIC_SYSTEM, "false");

        DEFAULT_FLAGS.put(DYNAMIC_SYSTEM, "false");

        DEFAULT_FLAGS.put(SEAMLESS_TRANSFER, "false");

        DEFAULT_FLAGS.put(SEAMLESS_TRANSFER, "false");

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");

        DEFAULT_FLAGS.put(SAFETY_HUB, "true");

        DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");

        DEFAULT_FLAGS.put(SCREENRECORD_LONG_PRESS, "false");

        DEFAULT_FLAGS.put(FORCE_GLOBAL_ACTIONS_GRID_ENABLED, "false");

        DEFAULT_FLAGS.put(FORCE_GLOBAL_ACTIONS_GRID_ENABLED, "false");

        DEFAULT_FLAGS.put(GLOBAL_ACTIONS_PANEL_ENABLED, "true");

        DEFAULT_FLAGS.put(GLOBAL_ACTIONS_PANEL_ENABLED, "true");