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

Commit 94a19db5 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 

* commit '59d1b26a':
  DataConnectionTracker cleanup when disposed.
parents 038c7297 59d1b26a

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

+4 −0
Original line number Diff line number Diff line
@@ -247,6 +247,9 @@ public abstract class DataConnectionTracker extends Handler { 
    /* Currently active APN */

    protected ApnSetting mActiveApn;



    /* Once disposed dont handle any messages */

    protected boolean mIsDisposed = false;



    protected BroadcastReceiver mIntentReceiver = new BroadcastReceiver ()

    {

        @Override
@@ -327,6 +330,7 @@ public abstract class DataConnectionTracker extends Handler { 
    }



    public void dispose() {

        mIsDisposed = true;

        mPhone.getContext().unregisterReceiver(this.mIntentReceiver);

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { 


    @Override

    public void dispose() {

        cleanUpConnection(false, null);



        super.dispose();



        // Unregister from all events
@@ -861,7 +863,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { 
    @Override

    public void handleMessage (Message msg) {



        if (!mPhone.mIsTheCurrentActivePhone) {

        if (!mPhone.mIsTheCurrentActivePhone || mIsDisposed) {

            log("Ignore CDMA msgs since CDMA phone is inactive");

            return;

        }

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

+3 −1
Original line number Diff line number Diff line
@@ -192,6 +192,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 


    @Override

    public void dispose() {

        cleanUpAllConnections(false, null);



        super.dispose();



        //Unregister for all events
@@ -1791,7 +1793,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
    public void handleMessage (Message msg) {

        if (DBG) log("GSMDataConnTrack handleMessage "+msg);



        if (!mPhone.mIsTheCurrentActivePhone) {

        if (!mPhone.mIsTheCurrentActivePhone || mIsDisposed) {

            log("Ignore GSM msgs since GSM phone is inactive");

            return;

        }