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

Merge "initial value for data_roaming based on carrier" into oc-dr1-dev

Browse Source
This commit is contained in:
Chen Xu
2017-07-19 03:06:01 +00:00
committed by Android (Google) Code Review
parent cbc1e6afe9 7834be2a3c
commit 068397a319
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

@@ -1065,6 +1065,13 @@ public class CarrierConfigManager {
public static final String KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY =
"carrier_app_no_wake_signal_config";
/**
* Default value for {@link Settings.Global#DATA_ROAMING}
* @hide
*/
public static final String KEY_CARRIER_DEFAULT_DATA_ROAMING_ENABLED_BOOL =
"carrier_default_data_roaming_enabled_bool";
/**
* Determines whether the carrier supports making non-emergency phone calls while the phone is
* in emergency callback mode. Default value is {@code true}, meaning that non-emergency calls
@@ -1632,6 +1639,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);
sDefaults.putString(KEY_CARRIER_NAME_STRING, "");
sDefaults.putBoolean(KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_DEFAULT_DATA_ROAMING_ENABLED_BOOL, false);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);