From b3571da33cd77218deb382374bddb8a043f27383 Mon Sep 17 00:00:00 2001 From: Sandeep Gutta Date: Thu, 31 Dec 2015 09:01:45 +0530 Subject: MSIM: Use SIM specific subId for setMccMnc While updating MccMnc value use the subId corresponds to the SIM slotId. Change-Id: Ifd7295a264f48e1210d87cb83ac76f5ad46df356 CRs-Fixed: 956103 --- src/java/com/android/internal/telephony/uicc/SIMRecords.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/java/com/android/internal/telephony/uicc/SIMRecords.java b/src/java/com/android/internal/telephony/uicc/SIMRecords.java index 1ac262be0..8b6f74395 100644 --- a/src/java/com/android/internal/telephony/uicc/SIMRecords.java +++ b/src/java/com/android/internal/telephony/uicc/SIMRecords.java @@ -1429,11 +1429,14 @@ public class SIMRecords extends IccRecords { if (!TextUtils.isEmpty(operator)) { log("onAllRecordsLoaded set 'gsm.sim.operator.numeric' to operator='" + operator + "'"); - log("update icc_operator_numeric=" + operator); mTelephonyManager.setSimOperatorNumericForPhone( mParentApp.getPhoneId(), operator); final SubscriptionController subController = SubscriptionController.getInstance(); - subController.setMccMnc(operator, subController.getDefaultSmsSubId()); + int[] subId = subController.getSubId(mParentApp.getPhoneId()); + if (subId != null && subId.length > 0) { + subController.setMccMnc(operator, subId[0]); + log("update icc_operator_numeric = " + operator + " subId = " + subId[0]); + } } else { log("onAllRecordsLoaded empty 'gsm.sim.operator.numeric' skipping"); } -- cgit v1.2.3