commit 9ad528d51c6e7b56e018100897b3c1cd6f9a2c17
author John Wang <johnwang@google.com> Mon Feb 06 17:02:30 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 06 17:02:30 2012 -0800
tree a7a2f99a6e63dc2de5d112fa271bc06aefaa7533
parent b1f95c6a938f6eaaa7a3fd28574a14647178059b
parent 48ac0f14de9be4c91bdce4e601c5eef4fd2c3123

am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1

* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
  Don't use SNR in the invalid check.

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 {