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

Author: Robert Greenwalt

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

@@ -361,6 +361,12 @@ public boolean isDataConnectionAsDesired() {
     @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);
     }