Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e301d804 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "TD_SCDMA signal strength support" into cm-10.2

parents db6e4704 a2e75c27

telephony/java/android/telephony/SignalStrength.java

+3 −3
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ public class SignalStrength implements Parcelable { 
            boolean lteChecks = (getLteRsrp() == INVALID && getLteRsrq() == INVALID && getLteRssnr() == INVALID && getLteSignalStrenght() == 99);

            boolean oldRil = needsOldRilFeature("signalstrength");

            level = getLteLevel();

            if ((level == SIGNAL_STRENGTH_NONE_OR_UNKNOWN && getGsmAsuLevel() != 99 && lteChecks) || oldRil) {

            if ((level == SIGNAL_STRENGTH_NONE_OR_UNKNOWN && (getGsmAsuLevel() != 99 || getTdScdmaAsuLevel() != 255) && lteChecks) || oldRil) {

                level = getTdScdmaLevel();

                if (level == SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {

                    level = getGsmLevel();
@@ -546,7 +546,7 @@ public class SignalStrength implements Parcelable { 
        if (isGsm) {

            boolean oldRil = needsOldRilFeature("signalstrength");

            boolean lteChecks = (getLteRsrp() == INVALID && getLteRsrq() == INVALID && getLteRssnr() == INVALID && getLteSignalStrenght() == 99);

            if ((getLteLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN && getGsmAsuLevel() != 99 && lteChecks) || oldRil) {

            if ((getLteLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN && (getGsmAsuLevel() != 99 || getTdScdmaAsuLevel() != 255) && lteChecks) || oldRil) {

                if (getTdScdmaLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {

                    asuLevel = getGsmAsuLevel();

                } else {
@@ -584,7 +584,7 @@ public class SignalStrength implements Parcelable { 
        if(isGsm()) {

            boolean oldRil = needsOldRilFeature("signalstrength");

            boolean lteChecks = (getLteRsrp() == INVALID && getLteRsrq() == INVALID && getLteRssnr() == INVALID && getLteSignalStrenght() == 99);

            if ((getLteLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN && getGsmAsuLevel() != 99 && lteChecks) || oldRil) {

            if ((getLteLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN && (getGsmAsuLevel() != 99 || getTdScdmaAsuLevel() != 255) && lteChecks) || oldRil) {

                if (getTdScdmaLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {

                    dBm = getGsmDbm();

                } else {