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

Merge \"Add carrier config to report IMEI on CDMA phone.\" into nyc-mr1-dev

Browse Source 
am: a5b923bdd7

Change-Id: I383718bd1e756f560485b12259f6a5c98dc8a8f6
This commit is contained in:
Junda Liu
2016-07-15 19:50:46 +00:00
committed by android-build-merger
parent b9d34b3877 a5b923bdd7
commit 199290cdab
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

@@ -788,6 +788,13 @@ public class CarrierConfigManager {
/** @hide */ /** @hide */
public static final int CDMA_ROAMING_MODE_ANY = 2; public static final int CDMA_ROAMING_MODE_ANY = 2;
/**
* Report IMEI as device id even if it's a CDMA/LTE phone.
*
* @hide
*/
public static final String KEY_FORCE_IMEI_BOOL = "force_imei_bool";
/** /**
* The families of Radio Access Technologies that will get clustered and ratcheted, * The families of Radio Access Technologies that will get clustered and ratcheted,
* ie, we will report transitions up within the family, but not down until we change * ie, we will report transitions up within the family, but not down until we change
@@ -995,6 +1002,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.putBoolean(KEY_FORCE_IMEI_BOOL, false);
sDefaults.putInt(KEY_CDMA_ROAMING_MODE_INT, CDMA_ROAMING_MODE_RADIO_DEFAULT); sDefaults.putInt(KEY_CDMA_ROAMING_MODE_INT, CDMA_ROAMING_MODE_RADIO_DEFAULT);
// Carrier Signalling Receivers // Carrier Signalling Receivers