diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-26 06:42:42 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-26 06:42:42 -0700 |
commit | a5f158bdde77f8d173d1f1c95d0f92405c519b0f (patch) | |
tree | b6ffc6ca3b5e564a2d0675d612439c8227b3f44e /telephony | |
parent | 9021583421ace854a7affeb5e767d1da56e4f7de (diff) | |
parent | b3d49f1569ae5ccaf6017bb39d8cf39122dbdbb8 (diff) | |
download | frameworks_base-a5f158bdde77f8d173d1f1c95d0f92405c519b0f.zip frameworks_base-a5f158bdde77f8d173d1f1c95d0f92405c519b0f.tar.gz frameworks_base-a5f158bdde77f8d173d1f1c95d0f92405c519b0f.tar.bz2 |
Merge change 2347 into donut
* changes:
Fix Disconnect path for CDMA.
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java index 2cbad78..a9c0f46 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java @@ -146,12 +146,16 @@ public class CdmaDataConnection extends DataConnection { null, obtainMessage(EVENT_SETUP_DATA_CONNECTION_DONE)); } + private void tearDownData(Message msg) { + if (phone.mCM.getRadioState().isOn()) { + phone.mCM.deactivateDataCall(cid, obtainMessage(EVENT_DEACTIVATE_DONE, msg)); + } + } + protected void disconnect(Message msg) { onDisconnect = msg; if (state == State.ACTIVE) { - if (phone.mCM.getRadioState().isOn()) { - phone.mCM.deactivateDataCall(cid, obtainMessage(EVENT_DEACTIVATE_DONE, msg)); - } + tearDownData(msg); } else if (state == State.ACTIVATING) { receivedDisconnectReq = true; } else { @@ -280,7 +284,7 @@ public class CdmaDataConnection extends DataConnection { // Don't bother reporting success if there's already a // pending disconnect request, since DataConnectionTracker // has already updated its state. - disconnect(onDisconnect); + tearDownData(onDisconnect); } else { String[] response = ((String[]) ar.result); cid = Integer.parseInt(response[0]); |