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

Commit 32c65fcc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't show unset score values for AccessPoints." into oc-dev

parents f1946baa 8a43704a

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -335,6 +335,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 
        if (security != SECURITY_NONE) {

        if (security != SECURITY_NONE) {

            builder.append(',').append(securityToString(security, pskType));

            builder.append(',').append(securityToString(security, pskType));

        }

        }

        builder.append(",mRssi=").append(mRssi);

        builder.append(",level=").append(getLevel());

        builder.append(",level=").append(getLevel());

        if (mRankingScore != Integer.MIN_VALUE) {

        if (mRankingScore != Integer.MIN_VALUE) {

            builder.append(",rankingScore=").append(mRankingScore);

            builder.append(",rankingScore=").append(mRankingScore);
@@ -745,8 +746,12 @@ public class AccessPoint implements Comparable<AccessPoint> { 
            visibility.append(" rssi=").append(mInfo.getRssi());

            visibility.append(" rssi=").append(mInfo.getRssi());

            visibility.append(" ");

            visibility.append(" ");

            visibility.append(" score=").append(mInfo.score);

            visibility.append(" score=").append(mInfo.score);

            if (mRankingScore != Integer.MIN_VALUE) {

              visibility.append(" rankingScore=").append(getRankingScore());

              visibility.append(" rankingScore=").append(getRankingScore());

            }

            if (mBadge != NetworkBadging.BADGING_NONE) {

              visibility.append(" badge=").append(getBadge());

              visibility.append(" badge=").append(getBadge());

            }

            visibility.append(String.format(" tx=%.1f,", mInfo.txSuccessRate));

            visibility.append(String.format(" tx=%.1f,", mInfo.txSuccessRate));

            visibility.append(String.format("%.1f,", mInfo.txRetriesRate));

            visibility.append(String.format("%.1f,", mInfo.txRetriesRate));

            visibility.append(String.format("%.1f ", mInfo.txBadRate));

            visibility.append(String.format("%.1f ", mInfo.txBadRate));