From 8a43704a26af3e82879fcf51ce2d263861010fa5 Mon Sep 17 00:00:00 2001 From: Sundeep Ghuman Date: Mon, 5 Jun 2017 16:10:38 -0700 Subject: Don't show unset score values for AccessPoints. Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed Bug: b/3692675 Test: Visual confirmation Change-Id: I52909bf55e6efabd2be6c17542f2a15135d25c62 --- .../src/com/android/settingslib/wifi/AccessPoint.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index b3565eab79c9..623d1a6716a7 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -335,6 +335,7 @@ public class AccessPoint implements Comparable { if (security != SECURITY_NONE) { builder.append(',').append(securityToString(security, pskType)); } + builder.append(",mRssi=").append(mRssi); builder.append(",level=").append(getLevel()); if (mRankingScore != Integer.MIN_VALUE) { builder.append(",rankingScore=").append(mRankingScore); @@ -745,8 +746,12 @@ public class AccessPoint implements Comparable { visibility.append(" rssi=").append(mInfo.getRssi()); visibility.append(" "); visibility.append(" score=").append(mInfo.score); - visibility.append(" rankingScore=").append(getRankingScore()); - visibility.append(" badge=").append(getBadge()); + if (mRankingScore != Integer.MIN_VALUE) { + visibility.append(" rankingScore=").append(getRankingScore()); + } + if (mBadge != NetworkBadging.BADGING_NONE) { + visibility.append(" badge=").append(getBadge()); + } visibility.append(String.format(" tx=%.1f,", mInfo.txSuccessRate)); visibility.append(String.format("%.1f,", mInfo.txRetriesRate)); visibility.append(String.format("%.1f ", mInfo.txBadRate)); -- cgit v1.2.3-59-g8ed1b