diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 10:50:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 10:50:28 -0700 |
| commit | 8f094ca7d045132ec93d4e903e784a3c077708c3 (patch) | |
| tree | b5c1fd1c9949fa1d2d18ac6fde25e1b78ee28f42 | |
| parent | 295e7248b11557cf80ee9b7a12009d9cec5bd8b0 (diff) | |
| parent | 9ac95783fc5aab204077d7c81e17e1b4f8afb3c1 (diff) | |
| download | frameworks_base-8f094ca7d045132ec93d4e903e784a3c077708c3.zip frameworks_base-8f094ca7d045132ec93d4e903e784a3c077708c3.tar.gz frameworks_base-8f094ca7d045132ec93d4e903e784a3c077708c3.tar.bz2 | |
Merge change 3686 into donut
* changes:
Fix cleanupConnection when switching from wifi.
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java | 5 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java index 900480f..42f8fac 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java @@ -304,7 +304,10 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { sendMessage(obtainMessage(EVENT_TRY_SETUP_DATA)); } else if (!enable) { setEnabled(EXTERNAL_NETWORK_DEFAULT_ID, false); - cleanUpConnection(true, Phone.REASON_DATA_DISABLED); + Message msg = obtainMessage(EVENT_CLEAN_UP_CONNECTION); + msg.arg1 = 1; // tearDown is true + msg.obj = Phone.REASON_DATA_DISABLED; + sendMessage(msg); } return true; } diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index 3f43502..270f78b 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -487,7 +487,10 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { (isApnTypeActive(Phone.APN_TYPE_SUPL) && isEnabled(Phone.APN_TYPE_SUPL))) { return false; } - cleanUpConnection(true, Phone.REASON_DATA_DISABLED); + Message msg = obtainMessage(EVENT_CLEAN_UP_CONNECTION); + msg.arg1 = 1; // tearDown is true + msg.obj = Phone.REASON_DATA_DISABLED; + sendMessage(msg); return true; } else { // isEnabled && enable |