Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ic4bd706a,I680224ba am: bad2bc1167

Browse Source 
am: fb57a250aa

Change-Id: I3ed4373f425989f382d9b702deb41210e92c5da0
This commit is contained in:
Nathan Harold
2019-01-09 10:09:01 -08:00
committed by android-build-merger
parent 9e9899720c fb57a250aa
commit dc6ada0237
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/CellSignalStrengthLte.java
View File

@@ -30,7 +30,7 @@ import java.util.Objects;
public final class CellSignalStrengthLte extends CellSignalStrength implements Parcelable { public final class CellSignalStrengthLte extends CellSignalStrength implements Parcelable {
private static final String LOG_TAG = "CellSignalStrengthLte"; 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. * Indicates the unknown or undetectable RSSI value in ASU.

11
telephony/java/android/telephony/SignalStrength.java
View File

@@ -369,7 +369,7 @@ public class SignalStrength implements Parcelable {
public int getLevel() { public int getLevel() {
int level = getPrimary().getLevel(); int level = getPrimary().getLevel();
if (level < SIGNAL_STRENGTH_NONE_OR_UNKNOWN || level > SIGNAL_STRENGTH_GREAT) { 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 SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
} }
return getPrimary().getLevel(); return getPrimary().getLevel();
@@ -657,9 +657,16 @@ public class SignalStrength implements Parcelable {
} }
/** /**
* log * log warning
*/ */
private static void log(String s) { private static void log(String s) {
Rlog.w(LOG_TAG, s); Rlog.w(LOG_TAG, s);
} }
/**
* log error
*/
private static void loge(String s) {
Rlog.e(LOG_TAG, s);
}
} }