summaryrefslogtreecommitdiffstats
path: root/telephony/java/com/android
diff options
context:
space:
mode:
authorKazuhiro Ondo <kazuhiro.ondo@motorola.com>2011-06-30 15:34:56 -0500
committerWink Saville <wink@google.com>2011-06-30 17:26:54 -0700
commit012b86d4294182497c4c72a318e0f4cbe5075a44 (patch)
treeba52c6622570f3823295a075d81e46cd6e12de03 /telephony/java/com/android
parenta2267451ddf91cc330f4c283e86811e38328915b (diff)
downloadframeworks_base-012b86d4294182497c4c72a318e0f4cbe5075a44.zip
frameworks_base-012b86d4294182497c4c72a318e0f4cbe5075a44.tar.gz
frameworks_base-012b86d4294182497c4c72a318e0f4cbe5075a44.tar.bz2
DataConnection was cleaned up too early if it's already disconnecting
Fix one logic failure introduced in patch for bug 4901019. Bug: 4970726 Change-Id: Ifc4071b1cbf0c19fbd8356d7dcc16f9df39d4b54
Diffstat (limited to 'telephony/java/com/android')
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index 67f5158..a6b131a 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -788,13 +788,13 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
Message msg = obtainMessage(EVENT_DISCONNECT_DONE, apnContext);
apnContext.getDataConnection().tearDown(apnContext.getReason(), msg);
apnContext.setState(State.DISCONNECTING);
- } else {
- // apn is connected but no reference to dcac.
- // Should not be happen, but reset the state in case.
- apnContext.setState(State.IDLE);
- mPhone.notifyDataConnection(apnContext.getReason(),
- apnContext.getApnType());
}
+ } else {
+ // apn is connected but no reference to dcac.
+ // Should not be happen, but reset the state in case.
+ apnContext.setState(State.IDLE);
+ mPhone.notifyDataConnection(apnContext.getReason(),
+ apnContext.getApnType());
}
}
} else {