From 910e80478dbf2bd1f1b82ae62b12cd250b4ce8f5 Mon Sep 17 00:00:00 2001 From: Ramesh Sudini Date: Wed, 29 Jun 2011 11:43:27 -0500 Subject: [PATCH] Disconnect ApnContexts in INITING state when error. When DCT tears down a link due to error, the ApnContexts which are in INITING state are not torndown. Due to this the DC refCount does not hit 0, and the Data Link is not torndown. Bug: 4973894 Change-Id: If1263f360d55f6874220235fede294909db4837e --- .../telephony/gsm/GsmDataConnectionTracker.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index fe57d0dc15951..df5898bc0cb72 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -1055,10 +1055,16 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { } } if (!found) { - // ApnContext does not have dcan reorted in data call list. + // ApnContext does not have dcac reported in data call list. + // Fetch all the ApnContexts that map to this dcac which are in + // INITING state too. if (DBG) log("onDataStateChanged(ar): Connected apn not found in the list (" + apnContext.toString() + ")"); - list.add(apnContext); + if (apnContext.getDataConnectionAc() != null) { + list.addAll(apnContext.getDataConnectionAc().getApnListSync()); + } else { + list.add(apnContext); + } } } } @@ -1110,10 +1116,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { Collection apns = dcac.getApnListSync(); - // filter out ApnContext with "Connected" state. + // filter out ApnContext with "Connected/Connecting" state. ArrayList connectedApns = new ArrayList(); for (ApnContext apnContext : apns) { - if (apnContext.getState() == State.CONNECTED) { + if (apnContext.getState() == State.CONNECTED || + apnContext.getState() == State.CONNECTING || + apnContext.getState() == State.INITING) { connectedApns.add(apnContext); } }