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

Commit 5af00703 authored by Jack Yu's avatar Jack Yu
Browse files

Revert "Fixed that locale tracker incorrectly used the invalid cell info" 

This reverts commit 5d0e70f2.

Reason for revert: Caused boot loop crash b/79861643

Change-Id: I0484bbffd2ca75277b11014a70a15ce829591f0d
parent 5d0e70f2

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

+7 −6
Original line number Diff line number Diff line
@@ -217,11 +217,13 @@ public class LocaleTracker extends Handler { 
     */

    public synchronized void updateOperatorNumericSync(String operatorNumeric) {

        // Check if the operator numeric changes.

        if (DBG) log("updateOperatorNumericSync. mcc/mnc=" + operatorNumeric);

        if (!Objects.equals(mOperatorNumeric, operatorNumeric)) {

            String msg = "Operator numeric changes to " + operatorNumeric;

        String msg = "updateOperatorNumeric. mcc/mnc=" + operatorNumeric;

        if (DBG) log(msg);

        mLocalLog.log(msg);

        if (!Objects.equals(mOperatorNumeric, operatorNumeric)) {

            if (DBG) {

                log("onUpdateOperatorNumeric: operator numeric changes to " + operatorNumeric);

            }

            mOperatorNumeric = operatorNumeric;



            // If the operator numeric becomes unavailable, we need to get the latest cell info so
@@ -277,8 +279,7 @@ public class LocaleTracker extends Handler { 
    private void getCellInfo() {

        String msg;

        if (!mPhone.getServiceStateTracker().getDesiredPowerState()) {

            msg = "Radio is off. Skipped getting cell info. Cleared the previous cached cell info.";

            mCellInfo.clear();

            msg = "Radio is off. No need to get cell info.";

            if (DBG) log(msg);

            mLocalLog.log(msg);

            return;