From 2b5a3ec757c0b6cbc3d321258bf24532c326d23b Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Sat, 14 May 2011 12:07:50 -0700 Subject: [PATCH] Fix bevhavior of fetchDunApn. If nothing secure is set let us fall back to use general APN db entries. Change-Id: Ic6908dd301c432c11a6f773e06dd6e207d45a037 --- .../telephony/gsm/GsmDataConnectionTracker.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index 84b2932cc9c23..6416e491dab5a 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -513,8 +513,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { @Override protected boolean isApnTypeAvailable(String type) { - if (type.equals(Phone.APN_TYPE_DUN)) { - return (fetchDunApn() != null); + if (type.equals(Phone.APN_TYPE_DUN) && fetchDunApn() != null) { + return true; } if (mAllApns != null) { @@ -1855,9 +1855,11 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { if (requestedApnType.equals(Phone.APN_TYPE_DUN)) { ApnSetting dun = fetchDunApn(); - if (dun != null) apnList.add(dun); - if (DBG) log("buildWaitingApns: X added APN_TYPE_DUN apnList=" + apnList); - return apnList; + if (dun != null) { + apnList.add(dun); + if (DBG) log("buildWaitingApns: X added APN_TYPE_DUN apnList=" + apnList); + return apnList; + } } String operator = mPhone.mIccRecords.getOperatorNumeric();