Merge "Don't accept a user-defined dun-capable connection" into gingerbread

2011-03-10 10:41:36 -08:00
parent 4bdab1751f 4c89b14db4
commit dfcb8c5116
1 changed files with 6 additions and 0 deletions
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -361,6 +361,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
    @Override
    protected boolean isApnTypeActive(String type) {
        // TODO: support simultaneous with List instead
+        if (Phone.APN_TYPE_DUN.equals(type)) {
+            ApnSetting dunApn = fetchDunApn();
+            if (dunApn != null) {
+                return ((mActiveApn != null) && (dunApn.toString().equals(mActiveApn.toString())));
+            }
+        }
        return mActiveApn != null && mActiveApn.canHandleType(type);
    }