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

Support WFC roaming preference am: 2c25e4a96b

Browse Source 
am: 6db4fbecf8

Change-Id: Idff74a470e26b6c14ba1203290f533813740e192
This commit is contained in:
Meng Wang
2016-09-29 00:29:17 +00:00
committed by android-build-merger
parent e55e55e055 6db4fbecf8
commit 68b84f7301
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/provider/Settings.java
View File

@@ -8722,7 +8722,7 @@ public final class Settings {
public static final String WFC_IMS_ENABLED = "wfc_ims_enabled";
/**
* WFC Mode.
* WFC mode on home/non-roaming network.
* <p>
* Type: int - 2=Wi-Fi preferred, 1=Cellular preferred, 0=Wi-Fi only
*
@@ -8730,6 +8730,15 @@ public final class Settings {
*/
public static final String WFC_IMS_MODE = "wfc_ims_mode";
/**
* WFC mode on roaming network.
* <p>
* Type: int - see {@link WFC_IMS_MODE} for values
*
* @hide
*/
public static final String WFC_IMS_ROAMING_MODE = "wfc_ims_roaming_mode";
/**
* Whether WFC roaming is enabled
* <p>

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

@@ -295,13 +295,23 @@ public class CarrierConfigManager {
"carrier_wfc_supports_wifi_only_bool";
/**
* Default WFC_IMS_mode 0: WIFI_ONLY
* 1: CELLULAR_PREFERRED
* 2: WIFI_PREFERRED
* Default WFC_IMS_MODE for home network 0: WIFI_ONLY
* 1: CELLULAR_PREFERRED
* 2: WIFI_PREFERRED
* @hide
*/
public static final String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT =
"carrier_default_wfc_ims_mode_int";
/**
* Default WFC_IMS_MODE for roaming
* See {@link KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} for valid values.
*
* @hide
*/
public static final String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT =
"carrier_default_wfc_ims_roaming_mode_int";
/**
* Default WFC_IMS_enabled: true VoWiFi by default is on
* false VoWiFi by default is off
@@ -966,6 +976,18 @@ public class CarrierConfigManager {
*/
public static final String FILTERED_CNAP_NAMES_STRING_ARRAY = "filtered_cnap_names_string_array";
/**
* Determine whether user can change Wi-Fi Calling preference in roaming.
* {@code false} - roaming preference {@link KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT} is
* the same as home preference {@link KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT}
* and cannot be changed.
* {@code true} - roaming preference can be changed by user independently.
*
* @hide
*/
public static final String KEY_EDITABLE_WFC_ROAMING_MODE_BOOL =
"editable_wfc_roaming_mode_bool";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -988,6 +1010,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_PROMOTE_WFC_ON_CALL_FAIL_BOOL, false);
sDefaults.putInt(KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT, 2);
sDefaults.putInt(KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT, 2);
sDefaults.putBoolean(KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true);
@@ -1139,6 +1162,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL, false);
sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false);
sDefaults.putStringArray(FILTERED_CNAP_NAMES_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);
}
/**