summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-04-28 11:53:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-28 11:53:02 -0700
commit69e830dc31a4f6fc19d8392efede114afd20fe7b (patch)
tree2e2ef1dd96b0a3b6099de33b981d4b73d60b543f /telephony
parentc1f39396b94837f728c56b4c3e2f5c37e1d0eef7 (diff)
parent8daec83f9a3436819854827bcff480ce0a203ddb (diff)
downloadframeworks_base-69e830dc31a4f6fc19d8392efede114afd20fe7b.zip
frameworks_base-69e830dc31a4f6fc19d8392efede114afd20fe7b.tar.gz
frameworks_base-69e830dc31a4f6fc19d8392efede114afd20fe7b.tar.bz2
am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE
* commit '8daec83f9a3436819854827bcff480ce0a203ddb': Delay data reconnection after disconnected.
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index 223c8ad..8bae315 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -1618,7 +1618,10 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (apnContext.getPendingAction() == ApnContext.PENDING_ACTION_RECONNECT) {
apnContext.setPendingAction(ApnContext.PENDING_ACTION_NONE);
}
- trySetupData(apnContext);
+ // Wait a bit before trying the next APN, so that
+ // we're not tying up the RIL command channel.
+ // This also helps in any external dependency to turn off the context.
+ sendMessageDelayed(obtainMessage(EVENT_TRY_SETUP_DATA, apnContext),APN_DELAY_MILLIS);
}
}