From 1157e1a8d4320589983fc39688bb7be7d6487d67 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Wed, 20 Jun 2012 23:47:40 -0700 Subject: 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 --- .../com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'telephony/java/com/android/internal') 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); -- cgit v1.1