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

Commit 56e8e0bc authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE 

* commit '2b48ca07':
  Fix 2 functions getting connections up by apnType
parents 04f2ad1c 2b48ca07

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

+5 −2
Original line number Diff line number Diff line
@@ -671,8 +671,10 @@ public abstract class DataConnectionTracker extends Handler { 


    protected LinkProperties getLinkProperties(String apnType) {

        int id = apnTypeToId(apnType);



        if (isApnIdEnabled(id)) {

            DataConnectionAc dcac = mDataConnectionAsyncChannels.get(id);

            // TODO - remove this cdma-only hack and support multiple DCs.

            DataConnectionAc dcac = mDataConnectionAsyncChannels.get(0);

            return dcac.getLinkPropertiesSync();

        } else {

            return new LinkProperties();
@@ -682,7 +684,8 @@ public abstract class DataConnectionTracker extends Handler { 
    protected LinkCapabilities getLinkCapabilities(String apnType) {

        int id = apnTypeToId(apnType);

        if (isApnIdEnabled(id)) {

            DataConnectionAc dcac = mDataConnectionAsyncChannels.get(id);

            // TODO - remove this cdma-only hack and support multiple DCs.

            DataConnectionAc dcac = mDataConnectionAsyncChannels.get(0);

            return dcac.getLinkCapabilitiesSync();

        } else {

            return new LinkCapabilities();