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

Commit d237d05c authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Add Delay for data connection retry." into honeycomb-LTE

parents 8bc60413 cf7db80a

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

+3 −0
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ public abstract class DataConnectionTracker extends Handler { 


    public static final String APN_TYPE_KEY = "apnType";



    /** Delay between APN attempts */

    protected static final int APN_DELAY_MILLIS = 5000;



    // responds to the setInternalDataEnabled call - used internally to turn off data

    // for example during emergency calls

    protected boolean mInternalDataEnabled = true;

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

+2 −1
Original line number Diff line number Diff line
@@ -701,7 +701,8 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { 
        notifyDataConnection(reason);

        mActiveApn = null;

        if (retryAfterDisconnected(reason)) {

          trySetupData(reason);

          // Wait a bit before trying, so we're not tying up RIL command channel.

          sendMessageDelayed(obtainMessage(EVENT_TRY_SETUP_DATA, reason), APN_DELAY_MILLIS);

      }

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
    // call reRegisterNetwork, or pingTest succeeds.

    private int mPdpResetCount = 0;



    /** Delay between APN attempts */

    protected static final int APN_DELAY_MILLIS = 5000;



    //***** Constants