summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2012-06-20 23:47:40 -0700
committerWink Saville <wink@google.com>2012-06-27 16:23:33 -0700
commit1157e1a8d4320589983fc39688bb7be7d6487d67 (patch)
treea3ef06a1c87c60c2cce800f769c5bcaebc83910b /telephony
parent29775794d6014196063534415ad61d60e84e9c9a (diff)
downloadframeworks_base-1157e1a8d4320589983fc39688bb7be7d6487d67.zip
frameworks_base-1157e1a8d4320589983fc39688bb7be7d6487d67.tar.gz
frameworks_base-1157e1a8d4320589983fc39688bb7be7d6487d67.tar.bz2
When reconnecting disassociate dc and apnContext.
This is done in onActionIntentReconnectAlarm, which is called when retrying after an error, by setting the ApnContext.DataConnection & DataConnctionAc to null which intern clears the DataConnection.mApnList. With the mApnList cleared DataConnection.mRefCount will not be incremented because the DC will not be found by findReadyDataConnection. Thus fixing at least one cause of 6529189. Bug: 6529189 Change-Id: I40ff1966f6fbd2f69e97d77b9db7122e4c5b992f
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index 83fc9c1..ed67759 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -157,6 +157,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (dcac != null) {
for (ApnContext apnContext : dcac.getApnListSync()) {
+ apnContext.setDataConnectionAc(null);
+ apnContext.setDataConnection(null);
apnContext.setReason(reason);
if (apnContext.getState() == State.FAILED) {
apnContext.setState(State.IDLE);