From ffdd90543956496204ec0846232bb520c5bd38e6 Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Tue, 8 Jan 2019 14:57:15 -0800 Subject: [PATCH 1/2] Set DBG Flag False for CellSignalStrengthLte The debug flag for CellSignalStrengthLte was left "true" due to "f23153f - Refactor SignalStrength". This CL sets it to false to fix log spam. Bug: 122545223 Test: compilation Change-Id: I680224ba726dde26c1e45584bd37d85bc02aa91a --- telephony/java/android/telephony/CellSignalStrengthLte.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/CellSignalStrengthLte.java b/telephony/java/android/telephony/CellSignalStrengthLte.java index 893dbe31ce0b3..61c6b48976c5f 100644 --- a/telephony/java/android/telephony/CellSignalStrengthLte.java +++ b/telephony/java/android/telephony/CellSignalStrengthLte.java @@ -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. From 5472d802b7833a13592df2de1ed8f364b9443c3b Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Tue, 8 Jan 2019 15:02:55 -0800 Subject: [PATCH 2/2] Log Invalid Level as an Error in SignalStrength If one of the CellSignalStrength classes returns a level value that's out of range, it should be logged as an error. This CL adds loge() to SignalStrength and logs this event at the correct level. Bug: 8675309 Test: compilation Change-Id: Ic4bd706ae83e647cd782a60d94db7077c6d0fc1b --- telephony/java/android/telephony/SignalStrength.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java index ef185c5eeaf18..2271069dddb77 100644 --- a/telephony/java/android/telephony/SignalStrength.java +++ b/telephony/java/android/telephony/SignalStrength.java @@ -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); + } }