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

Commit 06ce569b authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix 2 functions getting connections up by apnType 

A bad impl that only effected non-default connections on CDMA.
bug:4392820

Change-Id: If178dba90c4525289098fc88b80cf918e35f4d32
parent 4c8fa6d1

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

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




    protected LinkProperties getLinkProperties(String apnType) {

    protected LinkProperties getLinkProperties(String apnType) {

        int id = apnTypeToId(apnType);

        int id = apnTypeToId(apnType);



        if (isApnIdEnabled(id)) {

        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();

            return dcac.getLinkPropertiesSync();

        } else {

        } else {

            return new LinkProperties();

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

    protected LinkCapabilities getLinkCapabilities(String apnType) {

        int id = apnTypeToId(apnType);

        int id = apnTypeToId(apnType);

        if (isApnIdEnabled(id)) {

        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();

            return dcac.getLinkCapabilitiesSync();

        } else {

        } else {

            return new LinkCapabilities();

            return new LinkCapabilities();