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

Commit 859b72bb authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am a71a81b6: am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE 

* commit 'a71a81b6':
  Fix bevhavior of fetchDunApn.
parents 44488983 a71a81b6

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)) {