Merge changes from topic "signal-strength-cleanup" am: fb24180fe0 am: 2621c9f6ad (277ff087) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SignalStrength.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -492,14 +492,12 @@ public class SignalStrength implements Parcelable {
		public int getAsuLevel() {
		int asuLevel = 0;
		if (mIsGsm) {
		if (getLteLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {
		if (getTdScdmaLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {
		asuLevel = getGsmAsuLevel();
		} else {
		if (mLteRsrp != SignalStrength.INVALID) {
		asuLevel = getLteAsuLevel();
		} else if (mTdScdmaRscp != SignalStrength.INVALID) {
		asuLevel = getTdScdmaAsuLevel();
		}
		} else {
		asuLevel = getLteAsuLevel();
		asuLevel = getGsmAsuLevel();
		}
		} else {
		int cdmaAsuLevel = getCdmaAsuLevel();