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

Commit 82e5908d authored by Leo Hsu's avatar Leo Hsu
Browse files

RESTRICT AUTOMERGE: Removes feature flag for faster emergency call. 

Removes feature flag and enables faster emergency call features by
default.

Test: Manually

Bug: 112168722
Bug: 117128459
Change-Id: I81e64a229598b8c11a721a0dee7033f6ae3e4fdd
parent 8af3a241

core/java/android/util/FeatureFlagUtils.java

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

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

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

    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 HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

    public static final String EMERGENCY_DIAL_SHORTCUTS = "settings_emergency_dial_shortcuts";





    private static final Map<String, String> DEFAULT_FLAGS;

    private static final Map<String, String> DEFAULT_FLAGS;

    static {

    static {
@@ -48,7 +47,6 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put("settings_audio_switcher", "true");

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

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

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

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "true");

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "true");

        DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "false");

    }

    }





    /**

    /**

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

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

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.util.Log;

import android.view.ContextThemeWrapper;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;

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

        ArraySet<String> addedKeys = new ArraySet<String>();

        mHasLogoutButton = false;

        mHasLogoutButton = false;

        mHasLockdownButton = false;

        mHasLockdownButton = false;

        mSeparatedEmergencyButtonEnabled = FeatureFlagUtils

        mSeparatedEmergencyButtonEnabled = true;

                .isEnabled(mContext, FeatureFlagUtils.EMERGENCY_DIAL_SHORTCUTS);

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

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

            String actionKey = defaultActions[i];

            String actionKey = defaultActions[i];

            if (addedKeys.contains(actionKey)) {

            if (addedKeys.contains(actionKey)) {