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

Commit e436d46e authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix Cdma re-start of default connection. 

We dropped an onTrySetupData call because onEnableNewApn calls that automatically on GSM,
but CDMA was not doing anything.  Made CDMA simply call onTrySetupData.

Also, isApnTypeActive for CDMA was returning true even when no data was working.  Changed
to report true when initing or connected, like GSM.
parent e03848eb

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

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

    protected boolean isApnTypeActive(String type) {

        return (isApnTypeAvailable(type) &&

                mCdmaPhone.mSST.getCurrentCdmaDataConnectionState() ==

                ServiceState.STATE_IN_SERVICE);

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

    }



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



    protected String[] getActiveApnTypes() {

        if (mCdmaPhone.mSST.getCurrentCdmaDataConnectionState() ==

                ServiceState.STATE_IN_SERVICE) {

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

            return mSupportedApnTypes.clone();

        }

        return new String[0];
@@ -625,6 +623,15 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { 
        sendMessage(obtainMessage(EVENT_TRY_SETUP_DATA));

    }



    /**

     * @override com.android.intenral.telephony.DataConnectionTracker

     */

    @Override

    protected void onEnableNewApn() {

        // for cdma we only use this when default data is enabled..

        onTrySetupData(Phone.REASON_DATA_ENABLED);

    }



    /**

     * @override com.android.internal.telephony.DataConnectionTracker

     */