diff options
| author | Wink Saville <wink@google.com> | 2011-05-05 16:24:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-05 16:24:58 -0700 |
| commit | 06f20d3e0e56137b37505fb24de6b3545288cfd1 (patch) | |
| tree | be0eca7cae12faa2c0bd69e85b31942a5b1a0085 /telephony | |
| parent | 49240336cffe84fd5a096916f36ce3458376c125 (diff) | |
| parent | 3bebae4332144004db9f774bfde1abcd6c656b2c (diff) | |
| download | frameworks_base-06f20d3e0e56137b37505fb24de6b3545288cfd1.zip frameworks_base-06f20d3e0e56137b37505fb24de6b3545288cfd1.tar.gz frameworks_base-06f20d3e0e56137b37505fb24de6b3545288cfd1.tar.bz2 | |
am 3bebae43: am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE
* commit '3bebae4332144004db9f774bfde1abcd6c656b2c':
Add Delay for data connection retry.
Diffstat (limited to 'telephony')
3 files changed, 5 insertions, 3 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java index ad39b27..244f35e 100644 --- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java @@ -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; diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java index 2f783e8..f325812 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java @@ -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); } } diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index 69a8153..d3e659a 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -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 |