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

Commit d2dd1e65 authored by Kazuhiro Ondo's avatar Kazuhiro Ondo Committed by Android Git Automerger
Browse files

am 9820a9d2: am 4281817f: Allow suggestedRetryTime to indicate no retry is needed. 

* commit '9820a9d2':
  Allow suggestedRetryTime to indicate no retry is needed.
parents e30c1307 9820a9d2

telephony/java/com/android/internal/telephony/RILConstants.java

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ public interface RILConstants { 
    // From the top of ril.cpp

    int RIL_ERRNO_INVALID_RESPONSE = -1;



    int MAX_INT = 0x7FFFFFFF;



    // from RIL_Errno

    int SUCCESS = 0;

    int RADIO_NOT_AVAILABLE = 1;              /* If radio did not start or is resetting */

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

+5 −1
Original line number Diff line number Diff line
@@ -1834,8 +1834,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
                        retryOverride =

                            ((DataConnection.CallSetupException)ar.exception).getRetryOverride();

                    }

                    if (retryOverride == RILConstants.MAX_INT) {

                        if (DBG) log("No retry is suggested.");

                    } else {

                        startDelayedRetry(cause, apnContext, retryOverride);

                    }

                }

            } else {

                if (DBG) log("onDataSetupComplete: Try next APN");

                apnContext.setState(State.SCANNING);