commit 6618ff54e872766b3ae5be66d6004247e39f5ecd
author Wink Saville Thu Apr 02 11:00:56 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Apr 02 11:00:56 2009 -0700
tree 1c3035772fea551551bf53639d74d046efbf3744
parent cb0b1c7dd4f434156e2d06481b14955a7eaee97b

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Automated import of CL 144245

src/com/android/contacts/SpecialCharSequenceMgr.java

diff --git a/src/com/android/contacts/SpecialCharSequenceMgr.java b/src/com/android/contacts/SpecialCharSequenceMgr.java
index 38bc93d..999e141 100644
--- a/src/com/android/contacts/SpecialCharSequenceMgr.java
+++ b/src/com/android/contacts/SpecialCharSequenceMgr.java
@@ -154,7 +154,7 @@
                 sc.progressDialog.show();
 
                 // run the query.
-                handler.startQuery(ADN_QUERY_TOKEN, sc, Uri.parse("content://sim/adn"),
+                handler.startQuery(ADN_QUERY_TOKEN, sc, Uri.parse("content://icc/adn"),
                         new String[]{ADN_PHONE_NUMBER_COLUMN_NAME}, null, null, null);
                 return true;
             } catch (NumberFormatException ex) {
@@ -179,8 +179,16 @@
 
     static boolean handleIMEIDisplay(Context context, String input, boolean useSystemWindow) {
         if (input.equals(MMI_IMEI_DISPLAY)) {
-            showIMEIPanel(context, useSystemWindow);
-            return true;
+            int networkType = ((TelephonyManager)context.getSystemService(
+                    Context.TELEPHONY_SERVICE)).getNetworkType();
+            // check for GSM
+            if(networkType == TelephonyManager.NETWORK_TYPE_GPRS || 
+                    networkType == TelephonyManager.NETWORK_TYPE_EDGE || 
+                    networkType == TelephonyManager.NETWORK_TYPE_UMTS ) { 
+
+                showIMEIPanel(context, useSystemWindow); 
+                return true;
+            }
         }
 
         return false;