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

Merge "Add carrier config option to determine if "wifi-only" is supported." into nyc-dev

Browse Source 
am: 6c4af8c

* commit '6c4af8c9150293eb2eb73dae39451f7624f81c19':
  Add carrier config option to determine if "wifi-only" is supported.

Change-Id: I645a771e75d8a853ae2b7e192f88819cec5062cd
This commit is contained in:
Tyler Gunn
2016-04-01 15:56:02 +00:00
committed by android-build-merger
parent 6823bc1a0a 6c4af8c915
commit bbebbd3501
4 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,6 +251,16 @@ public class CarrierConfigManager {
*/
public static final String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";
/**
* Flag specifying whether WFC over IMS supports the "wifi only" option. If false, the wifi
* calling settings will not include an option for "wifi only". If true, the wifi calling
* settings will include an option for "wifi only"
* <p>
* By default, it is assumed that WFC supports "wifi only".
*/
public static final String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL =
"carrier_wfc_supports_wifi_only_bool";
/**
* Default WFC_IMS_mode 0: WIFI_ONLY
* 1: CELLULAR_PREFERRED
@@ -628,6 +638,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CARRIER_VOLTE_AVAILABLE_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_VT_AVAILABLE_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, true);
sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL, false);
sDefaults.putInt(KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT, 2);