resolve merge conflicts of 1fe47e3b8748221b405e0f8d21a45e8886694d51 to pi-dev-plus-aosp (47722ca2) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ public class GsmCdmaPhone extends Phone {
		setIsoCountryProperty(operatorNumeric);
		// Updates MCC MNC device configuration information
		logd("update mccmnc=" + operatorNumeric);
		MccTable.updateMccMncConfiguration(mContext, operatorNumeric, false);
		MccTable.updateMccMncConfiguration(mContext, operatorNumeric);
		}

		// Sets current entry in the telephony carrier table
		@@ -359,10 +359,7 @@ public class GsmCdmaPhone extends Phone {
		} else {
		String iso = "";
		try {
		iso = MccTable.countryCodeForMcc(Integer.parseInt(
		operatorNumeric.substring(0,3)));
		} catch (NumberFormatException ex) {
		Rlog.e(LOG_TAG, "setIsoCountryProperty: countryCodeForMcc error", ex);
		iso = MccTable.countryCodeForMcc(operatorNumeric.substring(0, 3));
		} catch (StringIndexOutOfBoundsException ex) {
		Rlog.e(LOG_TAG, "setIsoCountryProperty: countryCodeForMcc error", ex);
		}
		@@ -2708,7 +2705,7 @@ public class GsmCdmaPhone extends Phone {

		// Updates MCC MNC device configuration information
		logd("update mccmnc=" + operatorNumeric);
		MccTable.updateMccMncConfiguration(mContext, operatorNumeric, false);
		MccTable.updateMccMncConfiguration(mContext, operatorNumeric);

		return true;
		} catch (SQLException e) {

src/java/com/android/internal/telephony/LocaleTracker.java

+5 −12

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.util.LocalLog;

		import com.android.internal.util.CollectionUtils;
		import com.android.internal.util.IndentingPrintWriter;

		import java.io.FileDescriptor;
		@@ -257,7 +256,8 @@ public class LocaleTracker extends Handler {
		String msg = "getCellInfo: cell info=" + mCellInfo;
		if (DBG) log(msg);
		mLocalLog.log(msg);
		if (CollectionUtils.isEmpty(mCellInfo)) {

		if (mCellInfo == null \|\| mCellInfo.size() == 0) {
		// If we can't get a valid cell info. Try it again later.
		long delay = getCellInfoDelayTime(++mFailCellInfoCount);
		if (DBG) log("Can't get cell info. Try again in " + delay / 1000 + " secs.");
		@@ -280,8 +280,8 @@ public class LocaleTracker extends Handler {
		if (!TextUtils.isEmpty(mOperatorNumeric)) {
		try {
		mcc = mOperatorNumeric.substring(0, 3);
		countryIso = MccTable.countryCodeForMcc(Integer.parseInt(mcc));
		} catch (StringIndexOutOfBoundsException \| NumberFormatException ex) {
		countryIso = MccTable.countryCodeForMcc(mcc);
		} catch (StringIndexOutOfBoundsException ex) {
		loge("updateLocale: Can't get country from operator numeric. mcc = "
		+ mcc + ". ex=" + ex);
		}
		@@ -291,14 +291,7 @@ public class LocaleTracker extends Handler {
		// info.
		if (TextUtils.isEmpty(countryIso)) {
		mcc = getMccFromCellInfo();
		if (!TextUtils.isEmpty(mcc)) {
		try {
		countryIso = MccTable.countryCodeForMcc(Integer.parseInt(mcc));
		} catch (NumberFormatException ex) {
		loge("updateLocale: Can't get country from cell info. mcc = "
		+ mcc + ". ex=" + ex);
		}
		}
		countryIso = MccTable.countryCodeForMcc(mcc);
		}

		String msg = "updateLocale: mcc = " + mcc + ", country = " + countryIso;

src/java/com/android/internal/telephony/MccTable.java

+34 −56

Original line number	Diff line number	Diff line
		@@ -19,11 +19,9 @@ package com.android.internal.telephony;
		import android.app.ActivityManager;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.net.wifi.WifiManager;
		import android.os.Build;
		import android.os.RemoteException;
		import android.os.SystemProperties;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.util.Slog;

		@@ -112,6 +110,19 @@ public final class MccTable {
		}
		}

		/**
		* Given a GSM Mobile Country Code, returns
		* an ISO two-character country code if available.
		* Returns empty string if unavailable.
		*/
		public static String countryCodeForMcc(String mcc) {
		try {
		return countryCodeForMcc(Integer.parseInt(mcc));
		} catch (NumberFormatException ex) {
		return "";
		}
		}

		/**
		* Given a GSM Mobile Country Code, returns
		* an ISO 2-3 character language code if available.
		@@ -159,11 +170,9 @@ public final class MccTable {
		* correct version of resources. If MCC is 0, MCC and MNC will be ignored (not set).
		* @param context Context to act on.
		* @param mccmnc truncated imsi with just the MCC and MNC - MNC assumed to be from 4th to end
		* @param fromServiceState true if coming from the radio service state, false if from SIM
		*/
		public static void updateMccMncConfiguration(Context context, String mccmnc,
		boolean fromServiceState) {
		Slog.d(LOG_TAG, "updateMccMncConfiguration mccmnc='" + mccmnc + "' fromServiceState=" + fromServiceState);
		public static void updateMccMncConfiguration(Context context, String mccmnc) {
		Slog.d(LOG_TAG, "updateMccMncConfiguration mccmnc='" + mccmnc);

		if (Build.IS_DEBUGGABLE) {
		String overrideMcc = SystemProperties.get("persist.sys.override_mcc");
		@@ -176,19 +185,11 @@ public final class MccTable {
		if (!TextUtils.isEmpty(mccmnc)) {
		int mcc, mnc;

		String defaultMccMnc = TelephonyManager.getDefault().getSimOperatorNumeric();
		Slog.d(LOG_TAG, "updateMccMncConfiguration defaultMccMnc=" + defaultMccMnc);
		//Update mccmnc only for default subscription in case of MultiSim.
		// if (!defaultMccMnc.equals(mccmnc)) {
		// Slog.d(LOG_TAG, "Not a Default subscription, ignoring mccmnc config update.");
		// return;
		// }

		try {
		mcc = Integer.parseInt(mccmnc.substring(0, 3));
		mnc = Integer.parseInt(mccmnc.substring(3));
		} catch (NumberFormatException e) {
		Slog.e(LOG_TAG, "Error parsing IMSI: " + mccmnc);
		} catch (NumberFormatException \| StringIndexOutOfBoundsException ex) {
		Slog.e(LOG_TAG, "Error parsing IMSI: " + mccmnc + ". ex=" + ex);
		return;
		}

		@@ -196,10 +197,7 @@ public final class MccTable {
		if (mcc != 0) {
		setTimezoneFromMccIfNeeded(context, mcc);
		}
		if (fromServiceState) {
		setWifiCountryCodeFromMcc(context, mcc);
		} else {
		// from SIM

		try {
		Configuration config = new Configuration();
		boolean updateConfig = false;
		@@ -219,12 +217,6 @@ public final class MccTable {
		Slog.e(LOG_TAG, "Can't update configuration", e);
		}
		}
		} else {
		if (fromServiceState) {
		// an empty mccmnc means no signal - tell wifi we don't know
		setWifiCountryCodeFromMcc(context, 0);
		}
		}
		}

		/**
		@@ -396,20 +388,6 @@ public final class MccTable {
		return locale;
		}

		/**
		* Set the country code for wifi. This sets allowed wifi channels based on the
		* country of the carrier we see. If we can't see any, reset to 0 so we don't
		* broadcast on forbidden channels.
		* @param context Context to act on.
		* @param mcc Mobile Country Code of the operator. 0 if not known
		*/
		private static void setWifiCountryCodeFromMcc(Context context, int mcc) {
		String country = MccTable.countryCodeForMcc(mcc);
		Slog.d(LOG_TAG, "WIFI_COUNTRY_CODE set to " + country);
		WifiManager wM = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
		wM.setCountryCode(country);
		}

		static {
		sTable = new ArrayList<MccEntry>(240);

src/java/com/android/internal/telephony/ServiceStateTracker.java

+2 −11

Original line number	Diff line number	Diff line
		@@ -4389,15 +4389,6 @@ public class ServiceStateTracker extends Handler {
		return value;
		}

		protected void updateCarrierMccMncConfiguration(String newOp, String oldOp, Context context) {
		// if we have a change in operator, notify wifi (even to/from none)
		if (((newOp == null) && (TextUtils.isEmpty(oldOp) == false)) \|\|
		((newOp != null) && (newOp.equals(oldOp) == false))) {
		log("update mccmnc=" + newOp + " fromServiceState=true");
		MccTable.updateMccMncConfiguration(context, newOp, true);
		}
		}

		/**
		* Check ISO country by MCC to see if phone is roaming in same registered country
		*/
		@@ -4414,8 +4405,8 @@ public class ServiceStateTracker extends Handler {
		boolean inSameCountry = true;
		final String networkMCC = operatorNumeric.substring(0, 3);
		final String homeMCC = homeNumeric.substring(0, 3);
		final String networkCountry = MccTable.countryCodeForMcc(Integer.parseInt(networkMCC));
		final String homeCountry = MccTable.countryCodeForMcc(Integer.parseInt(homeMCC));
		final String networkCountry = MccTable.countryCodeForMcc(networkMCC);
		final String homeCountry = MccTable.countryCodeForMcc(homeMCC);
		if (networkCountry.isEmpty() \|\| homeCountry.isEmpty()) {
		// Not a valid country
		return false;

src/java/com/android/internal/telephony/SubscriptionController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1793,7 +1793,7 @@ public class SubscriptionController extends ISub.Stub {
		mDefaultFallbackSubId = subId;
		// Update MCC MNC device configuration information
		String defaultMccMnc = mTelephonyManager.getSimOperatorNumericForPhone(phoneId);
		MccTable.updateMccMncConfiguration(mContext, defaultMccMnc, false);
		MccTable.updateMccMncConfiguration(mContext, defaultMccMnc);

		// Broadcast an Intent for default sub change
		Intent intent = new Intent(TelephonyIntents.ACTION_DEFAULT_SUBSCRIPTION_CHANGED);