commit f48658aa174c36e0c2c1c96fd64303b085ec324a
author Wink Saville <wink@google.com> Wed Jun 20 23:47:40 2012 -0700
committer The Android Automerger <android-build@android.com> Fri Jul 13 14:19:00 2012 -0700
tree e8ac743e9de0f8b23da189f14a6f099f2056bf0e
parent c292a619c71a2ee56e42ca5ef45fbc62e5c09f1e

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

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

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 @@
 
         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);