Merge "Fix MMS failure due to wrong apn merge." (f17bbcc6) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+4 −11

Original line number	Diff line number	Diff line
		@@ -2489,6 +2489,8 @@ public final class DcTracker extends DcTrackerBase {
		}
		}

		dedupeApnSettings();

		if (mAllApnSettings.isEmpty() && isDummyProfileNeeded()) {
		addDummyApnSettings(operator);
		}
		@@ -2510,9 +2512,6 @@ public final class DcTracker extends DcTrackerBase {
		}
		if (DBG) log("createAllApnList: X mAllApnSettings=" + mAllApnSettings);

		//merge apns only after prefer apn is set
		dedupeApnSettings();

		setDataProfilesAsNeeded();
		}

		@@ -2614,15 +2613,9 @@ public final class DcTracker extends DcTrackerBase {
		String roamingProtocol = src.roamingProtocol.equals("IPV4V6") ? src.roamingProtocol :
		dest.roamingProtocol;
		int apnId = dest.id;
		if (mCanSetPreferApn && mPreferredApn != null) {
		if (src.id == mPreferredApn.id) {
		apnId = src.id;
		}
		} else {
		if (src.canHandleType(PhoneConstants.APN_TYPE_DEFAULT)) {
		apnId = src.id;
		}
		}

		return new ApnSetting(apnId, dest.numeric, dest.carrier, dest.apn,
		proxy, port, mmsc, mmsProxy, mmsPort, dest.user, dest.password,