Merge "Don't accept a user-defined dun-capable connection" into gingerbread (dfcb8c51) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}