commit badc204c431fbe6be2a59be4a3435f3ca8a09dad
author Jonathan Basseri <misterikkit@google.com> Mon Apr 20 20:42:42 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 20 20:42:43 2015 +0000
tree dc3851d8ac9657d96f9013668fbad928929e6e93
parent aff21c99eb669ca3eb087f435561f0f31598fd61
parent 1fa437cd0b34550ab4befc4f5198761e61b3b0bd

Merge "Check for invalid simOperator."

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 185aea0..c6a1921 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -270,7 +270,8 @@
         String gid2 = "";
         String spn = TelephonyManager.from(mContext).getSimOperatorNameForPhone(phoneId);
         String simOperator = TelephonyManager.from(mContext).getSimOperatorNumericForPhone(phoneId);
-        if (simOperator != null) {
+        // A valid simOperator should be 5 or 6 digits, depending on the length of the MNC.
+        if (simOperator != null && simOperator.length() >= 3) {
             mcc = simOperator.substring(0, 3);
             mnc = simOperator.substring(3);
         }