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

Commit 2270d056 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE 

* commit 'ede9ed9f':
  Fix getActiveApnTypes for GsmDCT.
parents 9e1e1360 ede9ed9f

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

+2 −2
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
        destroyDataConnections();

    }



    @Override

    public boolean isApnTypeActive(String type) {

        ApnContext apnContext = mApnContexts.get(type);

        if (apnContext == null) return false;
@@ -206,7 +207,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
        return (apnContext.getDataConnection() != null);

    }





    /**

     * The only circumstances under which we report that data connectivity is not

     * possible are
@@ -319,7 +319,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 


    @Override

    // Return all active apn types

    public synchronized String[] getActiveApnTypes() {

    public String[] getActiveApnTypes() {

        if (DBG) log("get all active apn types");

        ArrayList<String> result = new ArrayList<String>();