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

Merge changes Ic4bd706a,I680224ba

Browse Source 
am: bad2bc1167

Change-Id: I4319c12527fd2c6ee2c4eaf21a547725d528184b
This commit is contained in:
Nathan Harold
2019-01-09 09:56:28 -08:00
committed by android-build-merger
parent d6393758a7 bad2bc1167
commit fb57a250aa
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 {
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.

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

@@ -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);
}
}