am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev

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

1 files changed, 2 insertions, 3 deletions

diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index 7b9cf4e5f204..3363ca678c6a 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/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 = getLteDbm();
+            if (dBm == INVALID) {
                 dBm = getGsmDbm();
-            } else {
-                dBm = getLteDbm();
             }
         } else {
             int cdmaDbm = getCdmaDbm();