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

* commit 'a71a81b69a6e5757ff29f083783a4b704b6a9ae9':
  Fix bevhavior of fetchDunApn.

1 files 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 84b2932..6416e49 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();