Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8f094ca7: Merge change 3686 into donut

Browse Source 
Merge commit '8f094ca7d045132ec93d4e903e784a3c077708c3'

* commit '8f094ca7d045132ec93d4e903e784a3c077708c3':
  Fix cleanupConnection when switching from wifi.
This commit is contained in:
Android (Google) Code Review
2009-06-10 10:54:02 -07:00
committed by The Android Open Source Project
parent ba758194ca 8f094ca7d0
commit 164ab6572d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
View File

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

5
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

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