Revert "Revert "DCTracker: upgrade stubbed apn to Qcril Standard."" (d31bfb58) · Commits · e / os / android_frameworks_opt_telephony

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

+10 −5

Original line number	Diff line number	Diff line
		@@ -1206,11 +1206,14 @@ public class DcTracker extends DcTrackerBase {
		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_HIPRI };
		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)) {
		@@ -1218,10 +1221,12 @@ public class DcTracker extends DcTrackerBase {
		apnId = DctConstants.APN_DUN_ID;
		} else {
		types = mDefaultApnTypes;
		apnId = mDefaultApnId;
		apnId = DctConstants.APN_DEFAULT_ID;
		}
		apnSetting = new ApnSetting(apnId, "", "", "", "", "", "", "", "", "",
		"", 0, types, "IP", "IP", true, 0);
		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);
		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!");