Revert "Telephony: DcTracker: Fix CDMA APN Data issues." (3a252149) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −42

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

		private boolean trySetupData(ApnContext apnContext) {
		boolean retValue = false;
		if (DBG) {
		log("trySetupData for type:" + apnContext.getApnType() +
		" due to " + apnContext.getReason() + " apnContext=" + apnContext);
		@@ -1262,13 +1261,10 @@ public final class DcTracker extends DcTrackerBase {
		ArrayList<ApnSetting> waitingApns = buildWaitingApns(apnContext.getApnType(),
		radioTech);
		if (waitingApns.isEmpty()) {
		notifyOffApnsOfAvailability(apnContext.getReason());
		retValue = setupData(apnContext, radioTech);
		if(!retValue) {
		notifyNoData(DcFailCause.MISSING_UNKNOWN_APN, apnContext);
		}
		notifyOffApnsOfAvailability(apnContext.getReason());
		return retValue;
		if (DBG) log("trySetupData: X No APN found retValue=false");
		return false;
		} else {
		apnContext.setWaitingApns(waitingApns);
		if (DBG) {
		@@ -1287,9 +1283,7 @@ public final class DcTracker extends DcTrackerBase {
		+ apnListToString(apnContext.getWaitingApns()));
		}
		}

		retValue = setupData(apnContext, radioTech);

		boolean retValue = setupData(apnContext, radioTech);
		notifyOffApnsOfAvailability(apnContext.getReason());

		if (DBG) log("trySetupData: X retValue=" + retValue);
		@@ -1695,39 +1689,9 @@ public final class DcTracker extends DcTrackerBase {

		apnSetting = apnContext.getNextWaitingApn();
		if (apnSetting == null) {
		if(PhoneConstants.PHONE_TYPE_CDMA==mPhone.getPhoneType()) {
		String[] mDunApnTypes = { PhoneConstants.APN_TYPE_DUN };
		final int mDefaultApnId = DctConstants.APN_DEFAULT_ID;
		final String[] mDefaultApnTypes = {
		PhoneConstants.APN_TYPE_DEFAULT,
		PhoneConstants.APN_TYPE_MMS,
		PhoneConstants.APN_TYPE_SUPL,
		PhoneConstants.APN_TYPE_HIPRI,
		PhoneConstants.APN_TYPE_FOTA,
		PhoneConstants.APN_TYPE_IMS,
		PhoneConstants.APN_TYPE_CBS};


		String[] types;
		int apnId;
		if (mRequestedApnType.equals(PhoneConstants.APN_TYPE_DUN)) {
		types = mDunApnTypes;
		apnId = DctConstants.APN_DUN_ID;
		} else {
		types = mDefaultApnTypes;
		apnId = mDefaultApnId;
		}
		apnSetting = new ApnSetting(apnId, getOperatorNumeric(), null, null,
		null, null, null, null, null, null, null,
		RILConstants.SETUP_DATA_AUTH_PAP_CHAP, types,
		PROPERTY_CDMA_IPPROTOCOL, PROPERTY_CDMA_ROAMING_IPPROTOCOL, true, 0,
		0, false, 0, 0, 0, PhoneConstants.UNSET_MTU, "", "");
		if (DBG) log("setupData: CDMA detected and apnSetting == null, use stubbed CDMA APN setting= " + apnSetting);
		} else {
		if (DBG) log("setupData: return for no apn found!");
		return false;
		}
		}

		int profileId = apnSetting.profileId;
		if (profileId == 0) {