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
This commit is contained in:
Vineeta Srivastava
2016-07-15 19:44:44 +00:00
committed by Android (Google) Code Review
parent 7703ce2d21 276f4d648b
commit a5b923bdd7
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 */
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,
* 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.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);
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);
// Carrier Signalling Receivers