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

Commit 55b53d35 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am dfcb8c51: Merge "Don\'t accept a user-defined dun-capable connection" into gingerbread 

* commit 'dfcb8c51':
  Don't accept a user-defined dun-capable connection
parents c01fd043 dfcb8c51

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

+6 −0
Original line number Diff line number Diff line
@@ -361,6 +361,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
    @Override

    protected boolean isApnTypeActive(String type) {

        // TODO: support simultaneous with List instead

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

            ApnSetting dunApn = fetchDunApn();

            if (dunApn != null) {

                return ((mActiveApn != null) && (dunApn.toString().equals(mActiveApn.toString())));

            }

        }

        return mActiveApn != null && mActiveApn.canHandleType(type);

    }