commit d9a3168f605f58316a803599a75d556c41169550
author Li Zhe <jqc837@motorola.com> Thu Jul 30 14:08:42 2009 +0800
committer Wink Saville <wink@google.com> Wed Aug 19 10:13:26 2009 -0700
tree f4b399f0162961ce74d601c1c2d8d9ec7cddd08d
parent 358c2342adf4bf1a5a76a13b8236b47807ff8ea4

HSDPA (High-Speed Downlink Packet Access) Contacts IMEI and MEID

Use PhoneType instead of Network type for IMEI or MEID
- change SpecialCharSequenceMgr to use PhoneType for the displaying
  IMEI for UMTS, MEID for CDMA

src/com/android/contacts/SpecialCharSequenceMgr.java

diff --git a/src/com/android/contacts/SpecialCharSequenceMgr.java b/src/com/android/contacts/SpecialCharSequenceMgr.java
index 3f2c304..644b66f 100644
--- a/src/com/android/contacts/SpecialCharSequenceMgr.java
+++ b/src/com/android/contacts/SpecialCharSequenceMgr.java
@@ -179,20 +179,13 @@
 
     static boolean handleIMEIDisplay(Context context, String input, boolean useSystemWindow) {
         if (input.equals(MMI_IMEI_DISPLAY)) {
-            int networkType = ((TelephonyManager)context.getSystemService(
-                    Context.TELEPHONY_SERVICE)).getNetworkType();
+            int phoneType = ((TelephonyManager)context.getSystemService(
+                    Context.TELEPHONY_SERVICE)).getPhoneType();
 
-            if (networkType == TelephonyManager.NETWORK_TYPE_GPRS ||
-                    networkType == TelephonyManager.NETWORK_TYPE_EDGE ||
-                    networkType == TelephonyManager.NETWORK_TYPE_UMTS) {
-
+            if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
                 showIMEIPanel(context, useSystemWindow);
                 return true;
-            } else if (networkType == TelephonyManager.NETWORK_TYPE_CDMA ||
-                         networkType == TelephonyManager.NETWORK_TYPE_EVDO_0 ||
-                         networkType == TelephonyManager.NETWORK_TYPE_EVDO_A ||
-                         networkType == TelephonyManager.NETWORK_TYPE_1xRTT) {
-
+            } else if (phoneType == TelephonyManager.PHONE_TYPE_CDMA) {
                 showMEIDPanel(context, useSystemWindow);
                 return true;
             }