Merge "Change to not share ApnSetting objects between DEFAULT and ENTERPRISE" into sc-dev (a4f3f179) · Commits · e / os / android_frameworks_opt_telephony

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

+18 −2

Original line number	Diff line number	Diff line
		@@ -3681,7 +3681,15 @@ public class DcTracker extends Handler {
		if (mPreferredApn.getOperatorNumeric().equals(operator)) {
		if (mPreferredApn.canSupportNetworkType(
		ServiceState.rilRadioTechnologyToNetworkType(radioTech))) {
		// Create a new instance of ApnSetting for ENTERPRISE because each
		// DataConnection should have its own ApnSetting. ENTERPRISE uses the same
		// APN as DEFAULT but is a separate DataConnection
		if (ApnSetting.getApnTypesBitmaskFromString(requestedApnType)
		== ApnSetting.TYPE_ENTERPRISE) {
		apnList.add(ApnSetting.makeApnSetting(mPreferredApn));
		} else {
		apnList.add(mPreferredApn);
		}
		if (DBG) log("buildWaitingApns: X added preferred apnList=" + apnList);
		return apnList;
		}
		@@ -3700,7 +3708,15 @@ public class DcTracker extends Handler {
		if (apn.getApnSetId() == Telephony.Carriers.MATCH_ALL_APN_SET_ID
		\|\| preferredApnSetId == apn.getApnSetId()) {
		if (VDBG) log("buildWaitingApns: adding apn=" + apn);
		// Create a new instance of ApnSetting for ENTERPRISE because each
		// DataConnection should have its own ApnSetting. ENTERPRISE uses the same
		// APN as DEFAULT but is a separate DataConnection
		if (ApnSetting.getApnTypesBitmaskFromString(requestedApnType)
		== ApnSetting.TYPE_ENTERPRISE) {
		apnList.add(ApnSetting.makeApnSetting(apn));
		} else {
		apnList.add(apn);
		}
		} else {
		log("buildWaitingApns: APN set id " + apn.getApnSetId()
		+ " does not match the preferred set id " + preferredApnSetId);