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

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

am fcc57e87: Do not retry forever in DataConnection. 

* commit 'fcc57e87':
  Do not retry forever in DataConnection.
parents 10233ed3 fcc57e87

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+1 −0
Original line number Diff line number Diff line
@@ -747,6 +747,7 @@ public final class DataConnection extends StateMachine { 
        configureRetry(mApnSetting.canHandleType(PhoneConstants.APN_TYPE_DEFAULT));

        mRetryManager.setRetryCount(0);

        mRetryManager.setCurMaxRetryCount(mConnectionParams.mInitialMaxRetry);

        mRetryManager.setRetryForever(false);



        if (DBG) {

            log("initConnection: "

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+3 −2
Original line number Diff line number Diff line
@@ -1620,11 +1620,12 @@ public final class DcTracker extends DcTrackerBase { 


            if (apnContext.getWaitingApnsPermFailCount() == 0) {

                if (DBG) {

                    log("onDataSetupComplete: All APN's had permanent failures, stop retrying");

                    log("onDataSetupComplete: All APN's had permanent failures, long delay");

                }

                startAlarmForRestartTrySetup(APN_DELAY_MILLIS * 3, apnContext);

            } else {

                if (DBG) {

                    log("onDataSetupComplete: Not all APN's had permanent failures, retry");

                    log("onDataSetupComplete: Not all APN's had permanent failures, short delay");

                }

                startAlarmForRestartTrySetup(APN_DELAY_MILLIS, apnContext);

            }

src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public abstract class DcTrackerBase extends Handler { 
    /** Delay between APN attempts.

        Note the property override mechanism is there just for testing purpose only. */

    protected static final int APN_DELAY_MILLIS =

                                SystemProperties.getInt("persist.radio.apn_delay", 5000);

                                SystemProperties.getInt("persist.radio.apn_delay", 20000);



    AlarmManager mAlarmManager;