Merge "Add null check for mcc value" (f19c513d) · Commits · e / os / android_frameworks_opt_telephony

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

+12 −9

Original line number	Diff line number	Diff line
		@@ -315,7 +315,7 @@ public class LocaleTracker extends Handler {
		* @return a matching {@link MccMnc}. Null if the information is not available.
		*/
		@Nullable
		private MccMnc getMccMncFromCellInfo(String mccToMatch) {
		private MccMnc getMccMncFromCellInfo(@NonNull String mccToMatch) {
		MccMnc selectedMccMnc = null;
		if (mCellInfoList != null) {
		Map<MccMnc, Integer> mccMncMap = new HashMap<>();
		@@ -342,6 +342,7 @@ public class LocaleTracker extends Handler {
		return selectedMccMnc;
		}

		@Nullable
		private static String getNetworkMcc(CellInfo cellInfo) {
		String mccString = null;
		if (cellInfo instanceof CellInfoGsm) {
		@@ -536,6 +537,7 @@ public class LocaleTracker extends Handler {
		// info.
		if (TextUtils.isEmpty(countryIso)) {
		String mcc = getMccFromCellInfo();
		if (mcc != null) {
		countryIso = MccTable.countryCodeForMcc(mcc);
		countryIsoDebugInfo = "CellInfo: MccTable.countryCodeForMcc(\"" + mcc + "\")";

		@@ -546,6 +548,7 @@ public class LocaleTracker extends Handler {
		"CellInfo: MccTable.geoCountryCodeForMccMnc(" + mccMnc + ")";
		}
		}
		}

		if (mCountryOverride != null) {
		countryIso = mCountryOverride;