Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
  Don't use SNR in the invalid check.
This commit is contained in:
John Wang
2012-02-06 17:02:30 -08:00
committed by Android Git Automerger
parent b1f95c6a93 48ac0f14de
commit 9ad528d51c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/SignalStrength.java
View File

@@ -293,10 +293,11 @@ public class SignalStrength implements Parcelable {
int level; int level;
if (isGsm) { if (isGsm) {
// TODO Need solve the discrepancy of invalid values between
// RIL_LTE_SignalStrength and here.
if ((mLteSignalStrength == -1) if ((mLteSignalStrength == -1)
&& (mLteRsrp == -1) && (mLteRsrp == -1)
&& (mLteRsrq == -1) && (mLteRsrq == -1)
&& (mLteRssnr == INVALID_SNR)
&& (mLteCqi == -1)) { && (mLteCqi == -1)) {
level = getGsmLevel(); level = getGsmLevel();
} else { } else {
@@ -331,7 +332,6 @@ public class SignalStrength implements Parcelable {
if ((mLteSignalStrength == -1) if ((mLteSignalStrength == -1)
&& (mLteRsrp == -1) && (mLteRsrp == -1)
&& (mLteRsrq == -1) && (mLteRsrq == -1)
&& (mLteRssnr == INVALID_SNR)
&& (mLteCqi == -1)) { && (mLteCqi == -1)) {
asuLevel = getGsmAsuLevel(); asuLevel = getGsmAsuLevel();
} else { } else {
@@ -367,7 +367,6 @@ public class SignalStrength implements Parcelable {
if ((mLteSignalStrength == -1) if ((mLteSignalStrength == -1)
&& (mLteRsrp == -1) && (mLteRsrp == -1)
&& (mLteRsrq == -1) && (mLteRsrq == -1)
&& (mLteRssnr == INVALID_SNR)
&& (mLteCqi == -1)) { && (mLteCqi == -1)) {
dBm = getGsmDbm(); dBm = getGsmDbm();
} else { } else {