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

Commit 9f9ce253 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I59ceeae4 into eclair 

* changes:
  Fix the reporting of ActiveApnTypes on CDMA
parents 7745e035 59ceeae4

telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { 
    @Override

    protected boolean isApnTypeActive(String type) {

        return (isApnTypeAvailable(type) &&

                (state == State.CONNECTED || state == State.INITING));

                (state != State.IDLE));

    }



    @Override
@@ -260,7 +260,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { 
    }



    protected String[] getActiveApnTypes() {

        if (state == State.CONNECTED || state == State.INITING) {

        if (state != State.IDLE) {

            return mSupportedApnTypes.clone();

        }

        return new String[0];