summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-03-26 16:52:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-26 16:52:53 -0700
commit238b5c4e8470c51582ed53e3987626720ab4c013 (patch)
tree245a5ce57936ddf8f77f0fa11c1d87308069c1ad
parent9c2c7ace9e5658cb2c16b6e720ac39ea349d5921 (diff)
parent9eac2c077a92a95d0b7a9c766d4c6ee92f625d2e (diff)
downloadframeworks_base-238b5c4e8470c51582ed53e3987626720ab4c013.zip
frameworks_base-238b5c4e8470c51582ed53e3987626720ab4c013.tar.gz
frameworks_base-238b5c4e8470c51582ed53e3987626720ab4c013.tar.bz2
am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE
* commit '9eac2c077a92a95d0b7a9c766d4c6ee92f625d2e': Work around for operator not being correct.
-rwxr-xr-xtelephony/java/com/android/internal/telephony/gsm/SIMRecords.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
index 11ce83e..e69989a 100755
--- a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
@@ -478,6 +478,11 @@ public final class SIMRecords extends IccRecords {
// Length = length of MCC + length of MNC
// length of mcc = 3 (TS 23.003 Section 2.2)
+ if (SystemProperties.getInt(com.android.internal.telephony.TelephonyProperties
+ .PROPERTY_NETWORK_LTE_ON_CDMA, 0) == 1) {
+ Log.e(LOG_TAG, "getSIMOperatorNumeric: STOPSHIP bad numeric operators in lte");
+ return SystemProperties.get("ro.cdma.home.operator.numeric", "310004");
+ }
return imsi.substring(0, 3 + mncLength);
}