commit bf7e83689b290d3766effcb1a251e0dec1b672eb
author Wink Saville <wink@google.com> Wed May 18 17:47:49 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 18 17:47:49 2011 -0700
tree 950ab09d39e2d92c7a4c7bcd5cebd04f6bb416c2
parent b77c4e9c83e6c1c900a69d6755eb6f32e486a2a9
parent e34a7686a36bf0f48cd9d20090b4b8df1bf0d1ce

am e34a7686: am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE

* commit 'e34a7686a36bf0f48cd9d20090b4b8df1bf0d1ce':
  Remove SIM operator name hack

telephony/java/com/android/internal/telephony/gsm/SIMRecords.java

diff --git a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
index 27cde78..891c7cb 100755
--- a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
@@ -496,11 +496,6 @@
             return null;
         }
 
-        // STOPSHIP: to be removed
-        if (BaseCommands.getLteOnCdmaModeStatic() == Phone.LTE_ON_CDMA_TRUE) {
-            Log.e(LOG_TAG, "getOperatorNumeric: STOPSHIP bad numeric operators in lte");
-            return SystemProperties.get("ro.cdma.home.operator.numeric", "310004");
-        }
         // Length = length of MCC + length of MNC
         // length of mcc = 3 (TS 23.003 Section 2.2)
         return imsi.substring(0, 3 + mncLength);