am 7c2b29ac: am 1ea2aeda: am 589a4896: am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev

* commit '7c2b29ac45342074ec74860d6ba4a66bc8a8de5f':
  Fix to show low LTE signal strength as -140 instead of 0.

telephony/java/android/telephony/SignalStrength.java

@@ -533,10 +533,9 @@ public class SignalStrength implements Parcelable {
         int dBm;
 
         if(isGsm()) {
-            if (getLteLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {
-                dBm = getGsmDbm();
-            } else {
             dBm = getLteDbm();
+            if (dBm == INVALID) {
+                dBm = getGsmDbm();
             }
         } else {
             int cdmaDbm = getCdmaDbm();