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

Commit bad2bc11 authored by Nathan Harold's avatar Nathan Harold Committed by Gerrit Code Review
Browse files

Merge changes Ic4bd706a,I680224ba 

* changes:
  Log Invalid Level as an Error in SignalStrength
  Set DBG Flag False for CellSignalStrengthLte
parents 0a5f2637 5472d802

telephony/java/android/telephony/CellSignalStrengthLte.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import java.util.Objects; 
public final class CellSignalStrengthLte extends CellSignalStrength implements Parcelable {



    private static final String LOG_TAG = "CellSignalStrengthLte";

    private static final boolean DBG = true;

    private static final boolean DBG = false;



    /**

     * Indicates the unknown or undetectable RSSI value in ASU.

telephony/java/android/telephony/SignalStrength.java

+9 −2
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ public class SignalStrength implements Parcelable { 
    public int getLevel() {

        int level = getPrimary().getLevel();

        if (level < SIGNAL_STRENGTH_NONE_OR_UNKNOWN || level > SIGNAL_STRENGTH_GREAT) {

            log("Invalid Level " + level + ", this=" + this);

            loge("Invalid Level " + level + ", this=" + this);

            return SIGNAL_STRENGTH_NONE_OR_UNKNOWN;

        }

        return getPrimary().getLevel();
@@ -657,9 +657,16 @@ public class SignalStrength implements Parcelable { 
    }



    /**

     * log

     * log warning

     */

    private static void log(String s) {

        Rlog.w(LOG_TAG, s);

    }



    /**

     * log error

     */

    private static void loge(String s) {

        Rlog.e(LOG_TAG, s);

    }

}