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

am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE

Browse Source 
* commit '9713e3c60def9d755ae828d389fced4793a3c86a':
  Fix bevhavior of fetchDunApn.
This commit is contained in:
Robert Greenwalt
2011-05-15 08:03:46 -07:00
committed by Android Git Automerger
parent d0903e1478 9713e3c60d
commit a71a81b69a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -513,8 +513,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
@Override @Override
protected boolean isApnTypeAvailable(String type) { protected boolean isApnTypeAvailable(String type) {
if (type.equals(Phone.APN_TYPE_DUN)) { if (type.equals(Phone.APN_TYPE_DUN) && fetchDunApn() != null) {
return (fetchDunApn() != null); return true;
} }
if (mAllApns != null) { if (mAllApns != null) {
@@ -1855,10 +1855,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (requestedApnType.equals(Phone.APN_TYPE_DUN)) { if (requestedApnType.equals(Phone.APN_TYPE_DUN)) {
ApnSetting dun = fetchDunApn(); ApnSetting dun = fetchDunApn();
if (dun != null) apnList.add(dun); if (dun != null) {
apnList.add(dun);
if (DBG) log("buildWaitingApns: X added APN_TYPE_DUN apnList=" + apnList); if (DBG) log("buildWaitingApns: X added APN_TYPE_DUN apnList=" + apnList);
return apnList; return apnList;
} }
}
String operator = mPhone.mIccRecords.getOperatorNumeric(); String operator = mPhone.mIccRecords.getOperatorNumeric();
if (requestedApnType.equals(Phone.APN_TYPE_DEFAULT)) { if (requestedApnType.equals(Phone.APN_TYPE_DEFAULT)) {