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

Commit 8f094ca7 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 3686 into donut 

* changes:
  Fix cleanupConnection when switching from wifi.
parents 295e7248 9ac95783

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

+4 −1
Original line number Diff line number Diff line
@@ -304,7 +304,10 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { 
            sendMessage(obtainMessage(EVENT_TRY_SETUP_DATA));

        } else if (!enable) {

            setEnabled(EXTERNAL_NETWORK_DEFAULT_ID, false);

            cleanUpConnection(true, Phone.REASON_DATA_DISABLED);

            Message msg = obtainMessage(EVENT_CLEAN_UP_CONNECTION);

            msg.arg1 = 1; // tearDown is true

            msg.obj = Phone.REASON_DATA_DISABLED;

            sendMessage(msg);

        }

        return true;

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -487,7 +487,10 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
                (isApnTypeActive(Phone.APN_TYPE_SUPL) && isEnabled(Phone.APN_TYPE_SUPL))) {

                return false;

            }

            cleanUpConnection(true, Phone.REASON_DATA_DISABLED);

            Message msg = obtainMessage(EVENT_CLEAN_UP_CONNECTION);

            msg.arg1 = 1; // tearDown is true

            msg.obj = Phone.REASON_DATA_DISABLED;

            sendMessage(msg);

            return true;

        } else {

            // isEnabled && enable