Merge "Add support for FDN contact dial"

am: 082b118641

Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc
This commit is contained in:
Robert Greenwalt
2017-01-12 23:12:23 +00:00
committed by android-build-merger

View File

@@ -905,6 +905,13 @@ public class CarrierConfigManager {
public static final int CDMA_ROAMING_MODE_AFFILIATED = 1;
/** @hide */
public static final int CDMA_ROAMING_MODE_ANY = 2;
/**
* Boolean indicating if support is provided for directly dialing FDN number from FDN list.
* If false, this feature is not supported.
* @hide
*/
public static final String KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL =
"support_direct_fdn_dialing_bool";
/**
* Report IMEI as device id even if it's a CDMA/LTE phone.
@@ -1176,6 +1183,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);
sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);
sDefaults.putString(KEY_CARRIER_NAME_STRING, "");
sDefaults.putBoolean(KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL, false);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);