Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8ba5c8c authored by jianzhou's avatar jianzhou Committed by Xiaojing Zhang
Browse files

Settings: Fix no APN list 

Should get phoneId and slotId by SubscriptionManager.

Change-Id: I561530f068bdb5d578e0f3ce48d585f24aeaac5f
parent e80834ea

src/com/android/settings/ApnSettings.java

+6 −2
Original line number Diff line number Diff line
@@ -227,7 +227,9 @@ public class ApnSettings extends SettingsPreferenceFragment implements 
    private int getRadioTechnology(){

        ServiceState serviceState = null;

        if (TelephonyManager.getDefault().isMultiSimEnabled()) {

            serviceState = PhoneFactory.getPhone((int)mSubId).getServiceState();

            int phoneId = SubscriptionManager.getPhoneId(mSubId);

            Log.d(TAG,"getRadioTechnology.phoneId = " + phoneId);

            serviceState = PhoneFactory.getPhone(phoneId).getServiceState();

        } else {

            serviceState = PhoneFactory.getDefaultPhone().getServiceState();

        }
@@ -245,7 +247,9 @@ public class ApnSettings extends SettingsPreferenceFragment implements 
            IccRecords iccRecords = null;

            int appFamily = UiccController.getFamilyFromRadioTechnology(dataRat);

            if (TelephonyManager.getDefault().isMultiSimEnabled()) {

                iccRecords = UiccController.getInstance().getIccRecords((int)mSubId, appFamily);

                int slotId = SubscriptionManager.getSlotId(mSubId);

                Log.d(TAG,"getIccOperatorNumeric.slotId = " + slotId);

                iccRecords = UiccController.getInstance().getIccRecords(slotId, appFamily);

            } else {

                iccRecords = UiccController.getInstance().getIccRecords(0, appFamily);

            }