Merge "resolve merge conflicts of 2cb9a70cac0d22ef67de72c678c8baa4d12014f4 to master" (c8c13295) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -11536,14 +11536,6 @@ public final class Settings {
		*/
		public static final String EMERGENCY_AFFORDANCE_NEEDED = "emergency_affordance_needed";

		/**
		* Enable faster emergency phone call feature.
		* The value is a boolean (1 or 0).
		* @hide
		*/
		public static final String FASTER_EMERGENCY_PHONE_CALL_ENABLED =
		"faster_emergency_phone_call_enabled";

		/**
		* See RIL_PreferredNetworkType in ril.h
		* @hide

+2 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ public class FeatureFlagUtils {
		public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override.";
		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 EMERGENCY_DIAL_SHORTCUTS = "settings_emergency_dial_shortcuts";

		private static final Map<String, String> DEFAULT_FLAGS;
		static {
		@@ -47,6 +48,7 @@ public class FeatureFlagUtils {
		DEFAULT_FLAGS.put("settings_data_usage_v2", "false");
		DEFAULT_FLAGS.put("settings_seamless_transfer", "false");
		DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "true");
		DEFAULT_FLAGS.put(EMERGENCY_DIAL_SHORTCUTS, "false");
		}

		/**

+0 −1

Original line number	Diff line number	Diff line
		@@ -241,7 +241,6 @@ public class SettingsBackupTest {
		Settings.Global.EUICC_SUPPORTED_COUNTRIES,
		Settings.Global.EUICC_FACTORY_RESET_TIMEOUT_MILLIS,
		Settings.Global.FANCY_IME_ANIMATIONS,
		Settings.Global.FASTER_EMERGENCY_PHONE_CALL_ENABLED,
		Settings.Global.FORCE_ALLOW_ON_EXTERNAL,
		Settings.Global.FORCED_APP_STANDBY_ENABLED,
		Settings.Global.FORCED_APP_STANDBY_FOR_SMALL_BATTERY_ENABLED,

+3 −2

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ 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;
		@@ -318,8 +319,8 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		ArraySet<String> addedKeys = new ArraySet<String>();
		mHasLogoutButton = false;
		mHasLockdownButton = false;
		mSeparatedEmergencyButtonEnabled = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.FASTER_EMERGENCY_PHONE_CALL_ENABLED, 0) != 0;
		mSeparatedEmergencyButtonEnabled = FeatureFlagUtils
		.isEnabled(mContext, FeatureFlagUtils.EMERGENCY_DIAL_SHORTCUTS);
		for (int i = 0; i < defaultActions.length; i++) {
		String actionKey = defaultActions[i];
		if (addedKeys.contains(actionKey)) {