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

Commit 2c69b0b4 authored by yuanjiahsu's avatar yuanjiahsu Committed by Yuanjia Hsu
Browse files

Modify feature flag of Personal Safety 

1.Remove feature flag and let Emergency Dialer Shortcut feature always
enabled.
2.Add feature flag for Safety Hub (the bug ID to clean up this feature flag is b/118848485).

Test: Manually
Bug: 117128459
Bug: 118809382
Change-Id: I0a3819629bc579d93c682451abdf271d0b36bf59
parent 26213ed9

core/java/android/util/FeatureFlagUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ public class FeatureFlagUtils { 


    public static final String FFLAG_PREFIX = "sys.fflag.";

    public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override.";

    public static final String EMERGENCY_DIAL_SHORTCUTS = "settings_emergency_dial_shortcuts";

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

    public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

    public static final String SAFETY_HUB = "settings_safety_hub";



    private static final Map<String, String> DEFAULT_FLAGS;

    static {
@@ -47,8 +47,8 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put("settings_data_usage_v2", "true");

        DEFAULT_FLAGS.put("settings_audio_switcher", "true");

        DEFAULT_FLAGS.put("settings_systemui_theme", "true");

        DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "false");

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");

        DEFAULT_FLAGS.put(SAFETY_HUB, "false");

    }



    /**

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+1 −3
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import android.telephony.ServiceState; 
import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;
@@ -319,8 +318,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
        ArraySet<String> addedKeys = new ArraySet<String>();

        mHasLogoutButton = false;

        mHasLockdownButton = false;

        mSeparatedEmergencyButtonEnabled = FeatureFlagUtils

                .isEnabled(mContext, FeatureFlagUtils.EMERGENCY_DIAL_SHORTCUTS);

        mSeparatedEmergencyButtonEnabled = true;

        for (int i = 0; i < defaultActions.length; i++) {

            String actionKey = defaultActions[i];

            if (addedKeys.contains(actionKey)) {