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

Commit 43420a49 authored by Wink Saville's avatar Wink Saville
Browse files

Add use of net.tethering.noprovisioning to fetchDunApn 

To make it easier to test tethering, have fetchDunApn
return null when the system property
net.tethering.noprovisioning is true.

Change-Id: Id6162967c6b8b25f04380fe009961c150fa714ef
parent 5755d01d

telephony/java/com/android/internal/telephony/DataConnectionTracker.java

+11 −2
Original line number Diff line number Diff line
@@ -559,14 +559,23 @@ public abstract class DataConnectionTracker extends Handler { 
    }



    protected ApnSetting fetchDunApn() {

        if (SystemProperties.getBoolean("net.tethering.noprovisioning", false)) {

            log("fetchDunApn: net.tethering.noprovisioning=true ret: null");

            return null;

        }

        Context c = mPhone.getContext();

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

                Settings.Secure.TETHER_DUN_APN);

        ApnSetting dunSetting = ApnSetting.fromString(apnData);

        if (dunSetting != null) return dunSetting;

        if (dunSetting != null) {

            if (VDBG) log("fetchDunApn: secure TETHER_DUN_APN dunSetting=" + dunSetting);

            return dunSetting;

        }



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

        return ApnSetting.fromString(apnData);

        dunSetting = ApnSetting.fromString(apnData);

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

        return dunSetting;

    }



    public String[] getActiveApnTypes() {