summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2012-02-06 13:58:26 -0800
committerJohn Wang <johnwang@google.com>2012-02-06 14:03:57 -0800
commit7c70cefcae2d6a096112d746ae72f515898a3f45 (patch)
tree955247c8dd1fb8f16a31dbac98180cf16af99737 /telephony/java/android
parentf8aea99385df8373b6edd6d5dd1d15b7b36b525b (diff)
downloadframeworks_base-7c70cefcae2d6a096112d746ae72f515898a3f45.zip
frameworks_base-7c70cefcae2d6a096112d746ae72f515898a3f45.tar.gz
frameworks_base-7c70cefcae2d6a096112d746ae72f515898a3f45.tar.bz2
Don't use SNR in the invalid check.
Since some RILs use -1 instead of INVALID_SNR as invalid vlue for LTE SNR, SignalStrength will not use LTE SNR to check if LTE valid. bug:5970403 Change-Id: Ia948e076f8f5878e081e87680076b187857879c8
Diffstat (limited to 'telephony/java/android')
-rw-r--r--telephony/java/android/telephony/SignalStrength.java5
1 files changed, 2 insertions, 3 deletions
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 @@ public class SignalStrength implements Parcelable {
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 @@ public class SignalStrength implements Parcelable {
if ((mLteSignalStrength == -1)
&& (mLteRsrp == -1)
&& (mLteRsrq == -1)
- && (mLteRssnr == INVALID_SNR)
&& (mLteCqi == -1)) {
asuLevel = getGsmAsuLevel();
} else {
@@ -367,7 +367,6 @@ public class SignalStrength implements Parcelable {
if ((mLteSignalStrength == -1)
&& (mLteRsrp == -1)
&& (mLteRsrq == -1)
- && (mLteRssnr == INVALID_SNR)
&& (mLteCqi == -1)) {
dBm = getGsmDbm();
} else {