commit a4dcc38a5153ad53ec991701524f5a449bee5e4c
author Junda Liu <junda@google.com> Thu Jul 14 13:55:03 2016 -0700
committer gitbuildkicker <android-build@google.com> Fri Jul 15 14:48:32 2016 -0700
tree c6e3688149e244c21fab0f6ac92c36b20cfa0b7a
parent b36b466b793c1113a63cfa16ad2266b2ca6ecf09

Add carrier config to report IMEI on CDMA phone.

Bug: b/29340579
Change-Id: I3cac49af4b173f971b8153c00227141378f32b43

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 2a95d3e..3052cdb 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -789,6 +789,13 @@
     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
      * cells.  This prevents flapping between base technologies and higher techs that are
@@ -995,6 +1002,7 @@
         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