commit ec3f7998dbf2d700fde9c86bc9957ee1fb6204f6
author Sanket Padawe <sanketpadawe@google.com> Thu Dec 18 18:43:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 18 18:43:55 2014 +0000
tree d8bf0f5b4a72b3635f4ad5f9aecb3e72df64f2bc
parent 25f2cfe94ecc7d05c3c1a74c2e210fffcfc137e1
parent eec0c11ae3386284dd6797076764572efeca52c3

am eec0c11a: am 19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.

* commit 'eec0c11ae3386284dd6797076764572efeca52c3':
  Getting mcc/mnc from system prop instead of subInfoRecord.

src/com/android/settings/ApnSettings.java

diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index db5449f..836a74d 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -53,6 +53,7 @@
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
+import android.telephony.TelephonyManager;
 
 import java.util.ArrayList;
 
@@ -202,9 +203,10 @@
     }
 
     private void fillList() {
+        final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
         final String mccmnc = mSubscriptionInfo == null ? ""
-            : Integer.toString(mSubscriptionInfo.getMcc())
-                + Integer.toString(mSubscriptionInfo.getMnc());
+            : tm.getSimOperator(mSubscriptionInfo.getSubscriptionId());
+        Log.d(TAG, "mccmnc = " + mccmnc);
         final String where = "numeric=\""
             + mccmnc
             + "\"";