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

Commit 24c5e7c4 authored by Jack Yu's avatar Jack Yu Committed by Android Partner Code Review
Browse files

Merge "Reduced more radio log spam" into mm-wireless-dev

parents 2ed3add7 87f47e99

telephony/java/android/telephony/PhoneNumberUtils.java

+2 −4
Original line number Diff line number Diff line
@@ -1857,9 +1857,6 @@ public class PhoneNumberUtils 
        // to the list.

        number = extractNetworkPortionAlt(number);



        Rlog.d(LOG_TAG, "subId:" + subId + ", defaultCountryIso:" +

                ((defaultCountryIso == null) ? "NULL" : defaultCountryIso));



        String emergencyNumbers = "";

        int slotId = SubscriptionManager.getSlotId(subId);
@@ -1869,7 +1866,8 @@ public class PhoneNumberUtils 


        emergencyNumbers = SystemProperties.get(ecclist, "");



        Rlog.d(LOG_TAG, "slotId:" + slotId + ", emergencyNumbers: " +  emergencyNumbers);

        Rlog.d(LOG_TAG, "slotId:" + slotId + " subId:" + subId + " country:"

                + defaultCountryIso + " emergencyNumbers: " +  emergencyNumbers);



        if (TextUtils.isEmpty(emergencyNumbers)) {

            // then read-only ecclist property since old RIL only uses this

telephony/java/android/telephony/ServiceState.java

+4 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class ServiceState implements Parcelable { 


    static final String LOG_TAG = "PHONE";

    static final boolean DBG = true;

    static final boolean VDBG = false;  // STOPSHIP if true



    /**

     * Normal operation condition, the phone is registered
@@ -829,7 +830,7 @@ public class ServiceState implements Parcelable { 
    /** @hide */

    public void setDataRegState(int state) {

        mDataRegState = state;

        if (DBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRegState=" + mDataRegState);

        if (VDBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRegState=" + mDataRegState);

    }



    public void setRoaming(boolean roaming) {
@@ -1017,7 +1018,8 @@ public class ServiceState implements Parcelable { 
    /** @hide */

    public void setRilDataRadioTechnology(int rt) {

        this.mRilDataRadioTechnology = rt;

        if (DBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRadioTechnology=" + mRilDataRadioTechnology);

        if (VDBG) Rlog.d(LOG_TAG, "[ServiceState] setRilDataRadioTechnology=" +

                mRilDataRadioTechnology);

    }



    /** @hide */