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

Commit 1b1456db authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Null Check MCC and MNC for CellIdentity Location am: 44369497 

am: 2d91402d

Change-Id: I29934322dce36b39d9026d260bab5c2cc10273d6
parents faef6697 2d91402d

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

+7 −4
Original line number Diff line number Diff line
@@ -3328,10 +3328,13 @@ public class ServiceStateTracker extends Handler { 
            // camped on a cell either to attempt registration or for emergency services, then

            // for purposes of setting the locale, we don't care if registration fails or is

            // incomplete.

            String localeOperator = isInvalidOperatorNumeric(operatorNumeric)

                    && (mCellIdentity != null)

                    ? mCellIdentity.getMccString() + mCellIdentity.getMncString()

                    : operatorNumeric;

            // CellIdentity can return a null MCC and MNC in CDMA

            String localeOperator = operatorNumeric;

            if (isInvalidOperatorNumeric(operatorNumeric) && (mCellIdentity != null)

                    && mCellIdentity.getMccString() != null

                    && mCellIdentity.getMncString() != null) {

                localeOperator = mCellIdentity.getMccString() + mCellIdentity.getMncString();

            }



            if (isInvalidOperatorNumeric(localeOperator)) {

                if (DBG) log("localeOperator " + localeOperator + " is invalid");