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

Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev

Browse Source 
am: 130db7715a

Change-Id: I130ba1362d755e1859d5c22311867008d0626890
This commit is contained in:
qingxi
2016-06-14 17:15:41 +00:00
committed by android-build-merger
parent 844d178c2e 130db7715a
commit bd012f68ac
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -700,6 +700,24 @@ public class CarrierConfigManager {
public static final String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = public static final String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT =
"duration_blocking_disabled_after_emergency_int"; "duration_blocking_disabled_after_emergency_int";
/**
* @hide
* The default value for preferred CDMA roaming mode (aka CDMA system select.)
* CDMA_ROAMING_MODE_RADIO_DEFAULT = the default roaming mode from the radio
* CDMA_ROAMING_MODE_HOME = Home Networks
* CDMA_ROAMING_MODE_AFFILIATED = Roaming on Affiliated networks
* CDMA_ROAMING_MODE_ANY = Roaming on any networks
*/
public static final String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";
/** @hide */
public static final int CDMA_ROAMING_MODE_RADIO_DEFAULT = -1;
/** @hide */
public static final int CDMA_ROAMING_MODE_HOME = 0;
/** @hide */
public static final int CDMA_ROAMING_MODE_AFFILIATED = 1;
/** @hide */
public static final int CDMA_ROAMING_MODE_ANY = 2;
/** The default value for every variable. */ /** The default value for every variable. */
private final static PersistableBundle sDefaults; private final static PersistableBundle sDefaults;
@@ -836,6 +854,7 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_MMS_USER_AGENT_STRING, ""); sDefaults.putString(KEY_MMS_USER_AGENT_STRING, "");
sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true); sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);
sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false); sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);
sDefaults.putInt(KEY_CDMA_ROAMING_MODE_INT, CDMA_ROAMING_MODE_RADIO_DEFAULT);
// Used for Sim card State detection app // Used for Sim card State detection app
sDefaults.putStringArray(KEY_SIM_PROVISIONING_STATUS_DETECTION_CARRIER_APP_STRING_ARRAY, sDefaults.putStringArray(KEY_SIM_PROVISIONING_STATUS_DETECTION_CARRIER_APP_STRING_ARRAY,