Merge "Merge "Fix mLteSignalStrength range check" am: fbf9d61bb2 am: 9b11677ae8" into pi-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2018-03-10 02:38:33 +00:00
committed by Android (Google) Code Review

View File

@@ -911,11 +911,8 @@ public class SignalStrength implements Parcelable {
if (rsrpIconLevel != -1) return rsrpIconLevel;
/* Valid values are (0-63, 99) as defined in TS 36.331 */
// TODO the range here is probably supposed to be (0..31, 99). It's unclear if anyone relies
// on the current incorrect range check, so this will be fixed in a future release with more
// soak time
if (mLteSignalStrength > 63) rssiIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
/* Valid values are (0-31, 99) as defined in TS 27.007 8.5 */
if (mLteSignalStrength > 31) rssiIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
else if (mLteSignalStrength >= 12) rssiIconLevel = SIGNAL_STRENGTH_GREAT;
else if (mLteSignalStrength >= 8) rssiIconLevel = SIGNAL_STRENGTH_GOOD;
else if (mLteSignalStrength >= 5) rssiIconLevel = SIGNAL_STRENGTH_MODERATE;