Don't call Phone.getCdmaEriText on non-CDMA phone.
jsh [Wed, 10 Jun 2009 19:00:46 +0000 (12:00 -0700)]
src/com/android/phone/PhoneApp.java

index 364e614..20fec32 100644 (file)
@@ -1178,12 +1178,14 @@ public class PhoneApp extends Application {
             isCdma = true;
         }
 
-        if (!isCdma) eriText = "";
-
-        if (!hasService) {
-            eriText = getText(com.android.internal.R.string.roamingTextSearching).toString();
+        if (!isCdma) {
+            eriText = "";
         } else {
-            eriText = phone.getCdmaEriText();
+            if (!hasService) {
+                eriText = getText(com.android.internal.R.string.roamingTextSearching).toString();
+            } else {
+                eriText = phone.getCdmaEriText();
+            }
         }
 
         if (eriText != null) {