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

Commit f1d59f07 authored by Sungmin Choi's avatar Sungmin Choi Committed by Robert Greenwalt
Browse files

telephony: Support mvno tethering apn through config_tether_apndata 

The GSMDCT already has classfication of mvno operator in createApnList().
But, fetchDunApn() funtion has no consideration about mvno operator.
So it needs to be implemented for mvno operator.
As qualifier could not be classified by mvno parameter, the resource
should be changed to support multiple apns by one mcc/mnc.

The modified fetchDunApn() returns matched mvno apn or normal(not mvno) apn.

Bug: 10096119
Change-Id: I551236040c810b9603fb84542af9765184ce0c29
parent be70fe67

src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

+25 −5
Original line number Diff line number Diff line
@@ -661,12 +661,13 @@ public abstract class DcTrackerBase extends Handler { 
            return null;

        }

        int bearer = -1;

        ApnSetting retDunSetting = null;

        Context c = mPhone.getContext();

        String apnData = Settings.Global.getString(c.getContentResolver(),

                Settings.Global.TETHER_DUN_APN);

        List<ApnSetting> dunSettings = ApnSetting.arrayFromString(apnData);

        for (ApnSetting dunSetting : dunSettings) {

        IccRecords r = mIccRecords.get();

        for (ApnSetting dunSetting : dunSettings) {

            String operator = (r != null) ? r.getOperatorNumeric() : "";

            if (dunSetting.bearer != 0) {

                if (bearer == -1) bearer = mPhone.getServiceState().getRilDataRadioTechnology();
@@ -688,11 +689,30 @@ public abstract class DcTrackerBase extends Handler { 
            }

        }



        apnData = c.getResources().getString(R.string.config_tether_apndata);

        ApnSetting dunSetting = ApnSetting.fromString(apnData);

        if (VDBG) log("fetchDunApn: config_tether_apndata dunSetting=" + dunSettings);

        String[] apnArrayData = c.getResources().getStringArray(R.array.config_tether_apndata);

        for (String apn : apnArrayData) {

            ApnSetting dunSetting = ApnSetting.fromString(apn);

            if (dunSetting != null) {

                if (dunSetting.bearer != 0) {

                    if (bearer == -1) bearer = mPhone.getServiceState().getRilDataRadioTechnology();

                    if (dunSetting.bearer != bearer) continue;

                }

                if (dunSetting.hasMvnoParams()) {

                    if (r != null &&

                            mvnoMatches(r, dunSetting.mvnoType, dunSetting.mvnoMatchData)) {

                        if (VDBG) log("fetchDunApn: config_tether_apndata mvno dunSetting="

                                + dunSetting);

                        return dunSetting;

                    }

                } else {

                    retDunSetting = dunSetting;

                }

            }

        }



        if (VDBG) log("fetchDunApn: config_tether_apndata dunSetting=" + retDunSetting);

        return retDunSetting;

    }



    public String[] getActiveApnTypes() {

        String[] result;