Move apn related helper functions from DcTracker to ApnSetting. (63913dc9) · Commits · e / os / android_frameworks_opt_telephony

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

+47 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.text.TextUtils;

		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.RILConstants;
		import com.android.internal.telephony.uicc.IccRecords;

		import java.util.ArrayList;
		import java.util.List;
		@@ -325,6 +326,52 @@ public class ApnSetting {
		return false;
		}

		private static boolean imsiMatches(String imsiDB, String imsiSIM) {
		// Note: imsiDB value has digit number or 'x' character for seperating USIM information
		// for MVNO operator. And then digit number is matched at same order and 'x' character
		// could replace by any digit number.
		// ex) if imsiDB inserted '310260x10xxxxxx' for GG Operator,
		// that means first 6 digits, 8th and 9th digit
		// should be set in USIM for GG Operator.
		int len = imsiDB.length();
		int idxCompare = 0;

		if (len <= 0) return false;
		if (len > imsiSIM.length()) return false;

		for (int idx=0; idx<len; idx++) {
		char c = imsiDB.charAt(idx);
		if ((c == 'x') \|\| (c == 'X') \|\| (c == imsiSIM.charAt(idx))) {
		continue;
		} else {
		return false;
		}
		}
		return true;
		}

		public static boolean mvnoMatches(IccRecords r, String mvnoType, String mvnoMatchData) {
		if (mvnoType.equalsIgnoreCase("spn")) {
		if ((r.getServiceProviderName() != null) &&
		r.getServiceProviderName().equalsIgnoreCase(mvnoMatchData)) {
		return true;
		}
		} else if (mvnoType.equalsIgnoreCase("imsi")) {
		String imsiSIM = r.getIMSI();
		if ((imsiSIM != null) && imsiMatches(mvnoMatchData, imsiSIM)) {
		return true;
		}
		} else if (mvnoType.equalsIgnoreCase("gid")) {
		String gid1 = r.getGid1();
		int mvno_match_data_length = mvnoMatchData.length();
		if ((gid1 != null) && (gid1.length() >= mvno_match_data_length) &&
		gid1.substring(0, mvno_match_data_length).equalsIgnoreCase(mvnoMatchData)) {
		return true;
		}
		}
		return false;
		}

		// TODO - if we have this function we should also have hashCode.
		// Also should handle changes in type order and perhaps case-insensitivity
		@Override

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

+1 −48

Original line number	Diff line number	Diff line
		@@ -1111,53 +1111,6 @@ public final class DcTracker extends DcTrackerBase {
		return result;
		}

		private boolean imsiMatches(String imsiDB, String imsiSIM) {
		// Note: imsiDB value has digit number or 'x' character for seperating USIM information
		// for MVNO operator. And then digit number is matched at same order and 'x' character
		// could replace by any digit number.
		// ex) if imsiDB inserted '310260x10xxxxxx' for GG Operator,
		// that means first 6 digits, 8th and 9th digit
		// should be set in USIM for GG Operator.
		int len = imsiDB.length();
		int idxCompare = 0;

		if (len <= 0) return false;
		if (len > imsiSIM.length()) return false;

		for (int idx=0; idx<len; idx++) {
		char c = imsiDB.charAt(idx);
		if ((c == 'x') \|\| (c == 'X') \|\| (c == imsiSIM.charAt(idx))) {
		continue;
		} else {
		return false;
		}
		}
		return true;
		}

		@Override
		protected boolean mvnoMatches(IccRecords r, String mvnoType, String mvnoMatchData) {
		if (mvnoType.equalsIgnoreCase("spn")) {
		if ((r.getServiceProviderName() != null) &&
		r.getServiceProviderName().equalsIgnoreCase(mvnoMatchData)) {
		return true;
		}
		} else if (mvnoType.equalsIgnoreCase("imsi")) {
		String imsiSIM = r.getIMSI();
		if ((imsiSIM != null) && imsiMatches(mvnoMatchData, imsiSIM)) {
		return true;
		}
		} else if (mvnoType.equalsIgnoreCase("gid")) {
		String gid1 = r.getGid1();
		int mvno_match_data_length = mvnoMatchData.length();
		if ((gid1 != null) && (gid1.length() >= mvno_match_data_length) &&
		gid1.substring(0, mvno_match_data_length).equalsIgnoreCase(mvnoMatchData)) {
		return true;
		}
		}
		return false;
		}

		@Override
		protected boolean isPermanentFail(DcFailCause dcFailCause) {
		return (dcFailCause.isPermanentFail() &&
		@@ -1220,7 +1173,7 @@ public final class DcTracker extends DcTrackerBase {
		}

		if (apn.hasMvnoParams()) {
		if (r != null && mvnoMatches(r, apn.mvnoType, apn.mvnoMatchData)) {
		if (r != null && ApnSetting.mvnoMatches(r, apn.mvnoType, apn.mvnoMatchData)) {
		mvnoApns.add(apn);
		}
		} else {

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -704,8 +704,8 @@ public abstract class DcTrackerBase extends Handler {
		if (!ServiceState.bitmaskHasTech(dunSetting.bearerBitmask, bearer)) continue;
		if (dunSetting.numeric.equals(operator)) {
		if (dunSetting.hasMvnoParams()) {
		if (r != null &&
		mvnoMatches(r, dunSetting.mvnoType, dunSetting.mvnoMatchData)) {
		if (r != null && ApnSetting.mvnoMatches(r, dunSetting.mvnoType,
		dunSetting.mvnoMatchData)) {
		if (VDBG) {
		log("fetchDunApn: global TETHER_DUN_APN dunSetting=" + dunSetting);
		}
		@@ -725,10 +725,11 @@ public abstract class DcTrackerBase extends Handler {
		if (dunSetting != null) {
		if (!ServiceState.bitmaskHasTech(dunSetting.bearerBitmask, bearer)) continue;
		if (dunSetting.hasMvnoParams()) {
		if (r != null &&
		mvnoMatches(r, dunSetting.mvnoType, dunSetting.mvnoMatchData)) {
		if (VDBG) log("fetchDunApn: config_tether_apndata mvno dunSetting="
		+ dunSetting);
		if (r != null && ApnSetting.mvnoMatches(r, dunSetting.mvnoType,
		dunSetting.mvnoMatchData)) {
		if (VDBG) {
		log("fetchDunApn: config_tether_apndata mvno dunSetting=" + dunSetting);
		}
		return dunSetting;
		}
		} else {
		@@ -889,7 +890,6 @@ public abstract class DcTrackerBase extends Handler {
		public abstract void setDataAllowed(boolean enable, Message response);
		public abstract String[] getPcscfAddress(String apnType);
		public abstract void setImsRegistrationState(boolean registered);
		protected abstract boolean mvnoMatches(IccRecords r, String mvno_type, String mvno_match_data);
		protected abstract boolean isPermanentFail(DcFailCause dcFailCause);

		@Override