summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorKazuhiro Ondo <kazuhiro.ondo@motorola.com>2011-06-30 18:00:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-30 18:00:06 -0700
commitc0c07d4ff689a6050ef368933b9c53283a01520a (patch)
treeb228017005f59b9bd0f85804fef27c267fdf40b7 /telephony
parent672c468c453ea0b5195f42150d6772ac33d1f7e3 (diff)
parent012b86d4294182497c4c72a318e0f4cbe5075a44 (diff)
downloadframeworks_base-c0c07d4ff689a6050ef368933b9c53283a01520a.zip
frameworks_base-c0c07d4ff689a6050ef368933b9c53283a01520a.tar.gz
frameworks_base-c0c07d4ff689a6050ef368933b9c53283a01520a.tar.bz2
am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting
* commit '012b86d4294182497c4c72a318e0f4cbe5075a44': DataConnection was cleaned up too early if it's already disconnecting
Diffstat (limited to 'telephony')
-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 {