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

Commit dd154a77 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Fixed locale tracker logging am: b65f423b am: 3ebc017d 

Change-Id: I1fc2edf8e1e212252dc3927dfbe79c33c0754374
parents 1ef96c8b 3ebc017d

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

+6 −4
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ import java.util.Objects; 
 */

 */

public class LocaleTracker extends Handler {

public class LocaleTracker extends Handler {

    private static final boolean DBG = true;

    private static final boolean DBG = true;

    private static final String TAG = LocaleTracker.class.getSimpleName();





    /** Event for getting cell info from the modem */

    /** Event for getting cell info from the modem */

    private static final int EVENT_REQUEST_CELL_INFO = 1;

    private static final int EVENT_REQUEST_CELL_INFO = 1;
@@ -125,6 +124,8 @@ public class LocaleTracker extends Handler { 
    /** The maximum fail count to prevent delay time overflow */

    /** The maximum fail count to prevent delay time overflow */

    private static final int MAX_FAIL_COUNT = 30;

    private static final int MAX_FAIL_COUNT = 30;





    private String mTag;



    private final Phone mPhone;

    private final Phone mPhone;





    private final NitzStateMachine mNitzStateMachine;

    private final NitzStateMachine mNitzStateMachine;
@@ -241,6 +242,7 @@ public class LocaleTracker extends Handler { 
        mPhone = phone;

        mPhone = phone;

        mNitzStateMachine = nitzStateMachine;

        mNitzStateMachine = nitzStateMachine;

        mSimState = TelephonyManager.SIM_STATE_UNKNOWN;

        mSimState = TelephonyManager.SIM_STATE_UNKNOWN;

        mTag = LocaleTracker.class.getSimpleName() + "-" + mPhone.getPhoneId();





        final IntentFilter filter = new IntentFilter();

        final IntentFilter filter = new IntentFilter();

        filter.addAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED);

        filter.addAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED);
@@ -611,11 +613,11 @@ public class LocaleTracker extends Handler { 
    }

    }





    private void log(String msg) {

    private void log(String msg) {

        Rlog.d(TAG, msg);

        Rlog.d(mTag, msg);

    }

    }





    private void loge(String msg) {

    private void loge(String msg) {

        Rlog.e(TAG, msg);

        Rlog.e(mTag, msg);

    }

    }





    /**

    /**
@@ -627,7 +629,7 @@ public class LocaleTracker extends Handler { 
     */

     */

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, "  ");

        final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, "  ");

        pw.println("LocaleTracker:");

        pw.println("LocaleTracker-" + mPhone.getPhoneId() + ":");

        ipw.increaseIndent();

        ipw.increaseIndent();

        ipw.println("mIsTracking = " + mIsTracking);

        ipw.println("mIsTracking = " + mIsTracking);

        ipw.println("mOperatorNumeric = " + mOperatorNumeric);

        ipw.println("mOperatorNumeric = " + mOperatorNumeric);