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

Commit 2b5a3ec7 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix bevhavior of fetchDunApn. 

If nothing secure is set let us fall back to use general APN db entries.

Change-Id: Ic6908dd301c432c11a6f773e06dd6e207d45a037
parent 6d040a7f

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+7 −5
Original line number Diff line number Diff line
@@ -513,8 +513,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 


    @Override

    protected boolean isApnTypeAvailable(String type) {

        if (type.equals(Phone.APN_TYPE_DUN)) {

            return (fetchDunApn() != null);

        if (type.equals(Phone.APN_TYPE_DUN) && fetchDunApn() != null) {

            return true;

        }



        if (mAllApns != null) {
@@ -1855,10 +1855,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 


        if (requestedApnType.equals(Phone.APN_TYPE_DUN)) {

            ApnSetting dun = fetchDunApn();

            if (dun != null) apnList.add(dun);

            if (dun != null) {

                apnList.add(dun);

                if (DBG) log("buildWaitingApns: X added APN_TYPE_DUN apnList=" + apnList);

                return apnList;

            }

        }



        String operator = mPhone.mIccRecords.getOperatorNumeric();

        if (requestedApnType.equals(Phone.APN_TYPE_DEFAULT)) {