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

Commit 967f7c16 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 175 into donut 

* changes:
  telephony: Don't disable an APN type that is not enabled.
parents c12801e1 d90ff986

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

+5 −3
Original line number Diff line number Diff line
@@ -369,13 +369,15 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
     * The APN of the specified type is no longer needed. Ensure that if

     * use of the default APN has not been explicitly disabled, we are connected

     * to the default APN.

     * @param type the APN type. The only valid value currently is {@link Phone#APN_TYPE_MMS}.

     * @param type the APN type. The only valid values are currently 

     * {@link Phone#APN_TYPE_MMS} and {@link Phone#APN_TYPE_SUPL}.

     * @return

     */

    protected int disableApnType(String type) {

        Log.d(LOG_TAG, "disableApnType("+type+")");

        if (TextUtils.equals(type, Phone.APN_TYPE_MMS) ||

                TextUtils.equals(type, Phone.APN_TYPE_SUPL)) {

        if ((TextUtils.equals(type, Phone.APN_TYPE_MMS) ||

                TextUtils.equals(type, Phone.APN_TYPE_SUPL))

                && isEnabled(type)) {

            removeMessages(EVENT_RESTORE_DEFAULT_APN);

            setEnabled(type, false);

            if (isApnTypeActive(Phone.APN_TYPE_DEFAULT)) {