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

Merge "Non-default link should be cleaned up on telephony db change."

Browse Source
This commit is contained in:
Wink Saville
2011-10-19 16:27:32 -07:00
committed by Android (Google) Code Review
parent 4a41cb3147 3119b96098
commit b7219108c2
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1025,10 +1025,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
* Handles changes to the APN database.
*/
private void onApnChanged() {
// TODO: How to handle when multiple APNs are active?
ApnContext defaultApnContext = mApnContexts.get(Phone.APN_TYPE_DEFAULT);
boolean defaultApnIsDisconnected = defaultApnContext.isDisconnected();
State overallState = getOverallState();
boolean isDisconnected = (overallState == State.IDLE || overallState == State.FAILED);
if (mPhone instanceof GSMPhone) {
// The "current" may no longer be valid. MMS depends on this to send properly. TBD
@@ -1039,8 +1037,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
// match the current operator.
if (DBG) log("onApnChanged: createAllApnList and cleanUpAllConnections");
createAllApnList();
cleanUpAllConnections(!defaultApnIsDisconnected, Phone.REASON_APN_CHANGED);
if (defaultApnIsDisconnected) {
cleanUpAllConnections(!isDisconnected, Phone.REASON_APN_CHANGED);
if (isDisconnected) {
setupDataOnReadyApns(Phone.REASON_APN_CHANGED);
}
}