commit 48ac0f14de9be4c91bdce4e601c5eef4fd2c3123
author John Wang <johnwang@google.com> Mon Feb 06 17:00:49 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 06 17:00:49 2012 -0800
tree 95908d60c0ee7ec9d6047f67cc47de9d06023ddf
parent 331bb0c393d5e2ea2485102dcddbb8c2d42654d2
parent 7c70cefcae2d6a096112d746ae72f515898a3f45

Merge "Don't use SNR in the invalid check." into ics-mr1

telephony/java/android/telephony/SignalStrength.java

diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index 1a4b574..1049669 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -293,10 +293,11 @@
         int level;
 
         if (isGsm) {
+            // TODO Need solve the discrepancy of invalid values between
+            // RIL_LTE_SignalStrength and here.
             if ((mLteSignalStrength == -1)
                     && (mLteRsrp == -1)
                     && (mLteRsrq == -1)
-                    && (mLteRssnr == INVALID_SNR)
                     && (mLteCqi == -1)) {
                 level = getGsmLevel();
             } else {
@@ -331,7 +332,6 @@
             if ((mLteSignalStrength == -1)
                     && (mLteRsrp == -1)
                     && (mLteRsrq == -1)
-                    && (mLteRssnr == INVALID_SNR)
                     && (mLteCqi == -1)) {
                 asuLevel = getGsmAsuLevel();
             } else {
@@ -367,7 +367,6 @@
             if ((mLteSignalStrength == -1)
                     && (mLteRsrp == -1)
                     && (mLteRsrq == -1)
-                    && (mLteRssnr == INVALID_SNR)
                     && (mLteCqi == -1)) {
                 dBm = getGsmDbm();
             } else {