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

Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE

Browse Source
This commit is contained in:
Wink Saville
2011-04-28 11:50:24 -07:00
committed by Android (Google) Code Review
parent 1a517d0c25 315f107109
commit 7353301f73
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,6 +519,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
} else { } else {
if (DBG) log("return APN_ALREADY_INACTIVE"); if (DBG) log("return APN_ALREADY_INACTIVE");
apnContext.setEnabled(false); apnContext.setEnabled(false);
apnContext.setDataConnection(null);
return Phone.APN_ALREADY_INACTIVE; return Phone.APN_ALREADY_INACTIVE;
} }
@@ -1267,6 +1268,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (!apnContext.getDataConnection().isRetryNeeded()) { if (!apnContext.getDataConnection().isRetryNeeded()) {
if (!apnContext.getApnType().equals(Phone.APN_TYPE_DEFAULT)){ if (!apnContext.getApnType().equals(Phone.APN_TYPE_DEFAULT)){
// if no more retries on a secondary APN attempt, tell the world and revert. // if no more retries on a secondary APN attempt, tell the world and revert.
apnContext.setDataConnection(null);
notifyDataConnection(Phone.REASON_APN_FAILED); notifyDataConnection(Phone.REASON_APN_FAILED);
return; return;
} }
@@ -1562,6 +1564,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
log("onDataSetupComplete: All APN's had permanent failures, stop retrying"); log("onDataSetupComplete: All APN's had permanent failures, stop retrying");
} }
apnContext.setState(State.FAILED); apnContext.setState(State.FAILED);
apnContext.setDataConnection(null);
notifyDataConnection(Phone.REASON_APN_FAILED); notifyDataConnection(Phone.REASON_APN_FAILED);
} else { } else {
if (DBG) log("onDataSetupComplete: Not all permanent failures, retry"); if (DBG) log("onDataSetupComplete: Not all permanent failures, retry");
@@ -1600,6 +1603,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (apnContext.getPendingAction() == ApnContext.PENDING_ACTION_APN_DISABLE) { if (apnContext.getPendingAction() == ApnContext.PENDING_ACTION_APN_DISABLE) {
apnContext.setEnabled(false); apnContext.setEnabled(false);
apnContext.setPendingAction(ApnContext.PENDING_ACTION_NONE); apnContext.setPendingAction(ApnContext.PENDING_ACTION_NONE);
apnContext.setDataConnection(null);
} }
mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType()); mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());