Merge "Use settings DB only when mcc/mnc matches SIM" into klp-dev (088822a2) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -616,9 +616,13 @@ public abstract class DcTrackerBase extends Handler {
		Settings.Global.TETHER_DUN_APN);
		ApnSetting dunSetting = ApnSetting.fromString(apnData);
		if (dunSetting != null) {
		IccRecords r = mIccRecords.get();
		String operator = (r != null) ? r.getOperatorNumeric() : "";
		if (dunSetting.numeric.equals(operator)) {
		if (VDBG) log("fetchDunApn: global TETHER_DUN_APN dunSetting=" + dunSetting);
		return dunSetting;
		}
		}

		apnData = c.getResources().getString(R.string.config_tether_apndata);
		dunSetting = ApnSetting.fromString(apnData);