commit 589a4896b0c45f03604db1eb0292ef1c936adaff
author Amit Mahajan <amitmahajan@google.com> Sat Oct 11 00:24:13 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 11 00:24:13 2014 +0000
tree ff614fe11890bc00d751cf6f29e14d2acb2c2d30
parent 3bb0b2964df28a17999a53a4b3c7667f81a58506
parent c6c18618e999f24675e23b67e6c488d700199579

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.

telephony/java/android/telephony/SignalStrength.java

diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index 7b9cf4e..3363ca6 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -533,10 +533,9 @@
         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();