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

Merge change 5669 into donut

Browse Source 
* changes:
  Fix setting of the APN type.
This commit is contained in:
Android (Google) Code Review
2009-06-29 16:12:24 -07:00
parent 526355dea1 c0303921d0
commit bda04135ee
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,10 +377,14 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
removeMessages(EVENT_RESTORE_DEFAULT_APN); removeMessages(EVENT_RESTORE_DEFAULT_APN);
setEnabled(type, false); setEnabled(type, false);
if (isApnTypeActive(Phone.APN_TYPE_DEFAULT)) { if (isApnTypeActive(Phone.APN_TYPE_DEFAULT)) {
mRequestedApnType = Phone.APN_TYPE_DEFAULT;
if (dataEnabled[APN_DEFAULT_ID]) { if (dataEnabled[APN_DEFAULT_ID]) {
return Phone.APN_ALREADY_ACTIVE; return Phone.APN_ALREADY_ACTIVE;
} else { } else {
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 Phone.APN_REQUEST_STARTED; return Phone.APN_REQUEST_STARTED;
} }
} else { } else {
@@ -1235,10 +1239,9 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
protected void onRestoreDefaultApn() { protected void onRestoreDefaultApn() {
if (DBG) Log.d(LOG_TAG, "Restore default APN"); if (DBG) Log.d(LOG_TAG, "Restore default APN");
setEnabled(Phone.APN_TYPE_MMS, false); setEnabled(Phone.APN_TYPE_MMS, false);
mRequestedApnType = Phone.APN_TYPE_DEFAULT;
if (!isApnTypeActive(Phone.APN_TYPE_DEFAULT)) { if (!isApnTypeActive(Phone.APN_TYPE_DEFAULT)) {
cleanUpConnection(true, Phone.REASON_RESTORE_DEFAULT_APN); cleanUpConnection(true, Phone.REASON_RESTORE_DEFAULT_APN);
mRequestedApnType = Phone.APN_TYPE_DEFAULT;
} }
} }