Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 am: 503d8fbb26

Browse Source 
am: 907585c004

Change-Id: I05a4da02d0253eec03174277be22fc2daabad774
This commit is contained in:
Robert Greenwalt
2017-01-12 23:25:36 +00:00
committed by android-build-merger
parent 244a63a2d3 907585c004
commit f299153487
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -972,6 +972,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.
@@ -1312,6 +1319,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);