Merge "Don't use SNR in the invalid check." into ics-mr1 (48ac0f14) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SignalStrength.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -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 {