Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e70516b authored by Neil Fuller's avatar Neil Fuller
Browse files

Add null check for mcc value 

getMccFromCellInfo() can return a null MCC value, which must be guarded
against.

Test: treehugger
Bug: 145661751
Change-Id: I174abd12bb79e74b1474b5bf13807cc323f66c4c
parent 1f0d3d22

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;