Merge "Fixed duplicate APN issue" am: 5e40974d6c am: 0943100fc2 (186d277c) · Commits · e / os / android_frameworks_opt_telephony

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

+25 −50

Original line number	Diff line number	Diff line
		@@ -1942,7 +1942,7 @@ public class DcTracker extends Handler {
		// this type.
		if (!apnContext.getApnType().equals(PhoneConstants.APN_TYPE_DUN)
		\|\| ServiceState.isGsm(getDataRat())) {
		dataConnection = checkForCompatibleConnectedApnContext(apnContext);
		dataConnection = checkForCompatibleDataConnection(apnContext);
		if (dataConnection != null) {
		// Get the apn setting used by the data connection
		ApnSetting dataConnectionApnSetting = dataConnection.getApnSetting();
		@@ -2270,7 +2270,7 @@ public class DcTracker extends Handler {
		setDataProfilesAsNeeded();
		}

		private DataConnection checkForCompatibleConnectedApnContext(ApnContext apnContext) {
		private DataConnection checkForCompatibleDataConnection(ApnContext apnContext) {
		int apnType = apnContext.getApnTypeBitmask();
		ArrayList<ApnSetting> dunSettings = null;

		@@ -2278,73 +2278,48 @@ public class DcTracker extends Handler {
		dunSettings = sortApnListByPreferred(fetchDunApns());
		}
		if (DBG) {
		log("checkForCompatibleConnectedApnContext: apnContext=" + apnContext );
		log("checkForCompatibleDataConnection: apnContext=" + apnContext);
		}

		DataConnection potentialDc = null;
		ApnContext potentialApnCtx = null;
		for (ApnContext curApnCtx : mApnContexts.values()) {
		DataConnection curDc = curApnCtx.getDataConnection();
		for (DataConnection curDc : mDataConnections.values()) {
		if (curDc != null) {
		ApnSetting apnSetting = curApnCtx.getApnSetting();
		ApnSetting apnSetting = curDc.getApnSetting();
		log("apnSetting: " + apnSetting);
		if (dunSettings != null && dunSettings.size() > 0) {
		for (ApnSetting dunSetting : dunSettings) {
		if (dunSetting.equals(apnSetting)) {
		switch (curApnCtx.getState()) {
		case CONNECTED:
		if (curDc.isActive()) {
		if (DBG) {
		log("checkForCompatibleConnectedApnContext:"
		+ " found dun conn=" + curDc
		+ " curApnCtx=" + curApnCtx);
		log("checkForCompatibleDataConnection:"
		+ " found dun conn=" + curDc);
		}
		return curDc;
		case CONNECTING:
		} else if (curDc.isActivating()) {
		potentialDc = curDc;
		potentialApnCtx = curApnCtx;
		break;
		default:
		// Not connected, potential unchanged
		break;
		}
		}
		}
		} else if (apnSetting != null && apnSetting.canHandleType(apnType)) {
		switch (curApnCtx.getState()) {
		case CONNECTED:
		if (curDc.isActive()) {
		if (DBG) {
		log("checkForCompatibleConnectedApnContext:"
		+ " found canHandle conn=" + curDc
		+ " curApnCtx=" + curApnCtx);
		log("checkForCompatibleDataConnection:"
		+ " found canHandle conn=" + curDc);
		}
		return curDc;
		case CONNECTING:
		} else if (curDc.isActivating()) {
		potentialDc = curDc;
		potentialApnCtx = curApnCtx;
		break;
		default:
		// Not connected, potential unchanged
		break;
		}
		}
		} else {
		if (VDBG) {
		log("checkForCompatibleConnectedApnContext: not conn curApnCtx=" + curApnCtx);
		}
		}
		}
		if (potentialDc != null) {

		if (DBG) {
		log("checkForCompatibleConnectedApnContext: found potential conn=" + potentialDc
		+ " curApnCtx=" + potentialApnCtx);
		log("checkForCompatibleDataConnection: potential dc=" + potentialDc);
		}
		return potentialDc;
		}

		if (DBG) log("checkForCompatibleConnectedApnContext: NO conn apnContext=" + apnContext);
		return null;
		}

		private void addRequestNetworkCompleteMsg(Message onCompleteMsg,
		@ApnType int apnType) {
		if (onCompleteMsg != null) {