Revert "Getting mcc/mnc from system prop instead of subInfoRecord."

This reverts commit 579b66f28d.

Change-Id: I0b142b40c697992b60bca9020673a0828ec44977

src/com/android/settings/ApnSettings.java

@@ -53,7 +53,6 @@ import com.android.internal.telephony.Phone;
 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;
 
@@ -132,8 +131,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         final Activity activity = getActivity();
-        // Fixme: Workaround for single sim device.
-        mSubscriptionInfo = Utils.findRecordBySlotId(activity, 0);
+        final int subId = activity.getIntent().getIntExtra("sub_id", -1);
 
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
 
@@ -144,6 +142,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
             setHasOptionsMenu(true);
         }
 
+        mSubscriptionInfo = Utils.findRecordBySubId(activity, subId);
     }
 
     @Override
@@ -203,10 +202,9 @@ public class ApnSettings extends SettingsPreferenceFragment implements
     }
 
     private void fillList() {
-        final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
         final String mccmnc = mSubscriptionInfo == null ? ""
-              : tm.getSimOperator(mSubscriptionInfo.getSubscriptionId());
-        Log.d(TAG, "mccmnc = " + mccmnc);
+            : Integer.toString(mSubscriptionInfo.getMcc())
+                + Integer.toString(mSubscriptionInfo.getMnc());
         final String where = "numeric=\""
             + mccmnc
             + "\"";