PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prettify the wifi verbose logging string

Browse Source 
Bug:15168065

Change-Id: I1a3bd38ea6562b7b48c70db8fbd6940d4c96ceb4
This commit is contained in:
vandwalle
2014-09-05 00:00:24 -07:00
parent b5cc01342e
commit b6854480d4
2 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/arrays.xml
View File

@@ -293,6 +293,7 @@
<item>@string/wifi_security_psk_generic</item> <item>@string/wifi_security_psk_generic</item>
<!-- Do not translate. --> <!-- Do not translate. -->
<item>@string/wifi_security_eap</item> <item>@string/wifi_security_eap</item>
</string-array> </string-array>
<!-- Match this with the constants in AccessPoint. --> <skip /> <!-- Match this with the constants in AccessPoint. --> <skip />

89
src/com/android/settings/wifi/AccessPoint.java
View File

@@ -433,6 +433,8 @@ class AccessPoint extends Preference {
*/ */
private String getVisibilityStatus() { private String getVisibilityStatus() {
StringBuilder visibility = new StringBuilder(); StringBuilder visibility = new StringBuilder();
StringBuilder scans24GHz = null;
StringBuilder scans5GHz = null;
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
@@ -441,7 +443,7 @@ class AccessPoint extends Preference {
if (bssid != null) { if (bssid != null) {
visibility.append(" ").append(bssid); visibility.append(" ").append(bssid);
} }
visibility.append(" sc=").append(Integer.toString(mInfo.score)); visibility.append(" score=").append(mInfo.score);
visibility.append(" "); visibility.append(" ");
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));
@@ -455,63 +457,96 @@ class AccessPoint extends Preference {
int num5 = 0; int num5 = 0;
int num24 = 0; int num24 = 0;
int numBlackListed = 0; int numBlackListed = 0;
int n24 = 0; // Number scan results we included in the string
int n5 = 0; // Number scan results we included in the string
Map<String, ScanResult> list = mScanResultCache.snapshot(); Map<String, ScanResult> list = mScanResultCache.snapshot();
// TODO: sort list by RSSI or age
for (ScanResult result : list.values()) { for (ScanResult result : list.values()) {
if (result.seen == 0) if (result.seen == 0)
continue; continue;
if (result.autoJoinStatus != ScanResult.ENABLED) if (result.autoJoinStatus != ScanResult.ENABLED) numBlackListed++;
numBlackListed++;
if (result.frequency > LOWER_FREQ_5GHZ if (result.frequency >= LOWER_FREQ_5GHZ
&& result.frequency < HIGHER_FREQ_5GHZ) { && result.frequency <= HIGHER_FREQ_5GHZ) {
//strictly speaking: [4915, 5825] // Strictly speaking: [4915, 5825]
// number of known BSSID on 5GHz band // number of known BSSID on 5GHz band
num5 = num5 + 1; num5 = num5 + 1;
} else if (result.frequency > LOWER_FREQ_24GHZ } else if (result.frequency >= LOWER_FREQ_24GHZ
&& result.frequency < HIGHER_FREQ_24GHZ) { && result.frequency <= HIGHER_FREQ_24GHZ) {
//strictly speaking: [2412, 2482] // Strictly speaking: [2412, 2482]
// number of known BSSID on 2.4Ghz band // number of known BSSID on 2.4Ghz band
num24 = num24 + 1; num24 = num24 + 1;
} }
//ignore results seen, older than 20 seconds // Ignore results seen, older than 20 seconds
if (now - result.seen > VISIBILITY_OUTDATED_AGE_IN_MILLI) continue; if (now - result.seen > VISIBILITY_OUTDATED_AGE_IN_MILLI) continue;
if (result.frequency > LOWER_FREQ_5GHZ if (result.frequency >= LOWER_FREQ_5GHZ
&&result.frequency < HIGHER_FREQ_5GHZ) { && result.frequency <= HIGHER_FREQ_5GHZ) {
if (result.level > rssi5) { if (result.level > rssi5) {
rssi5 = result.level; rssi5 = result.level;
} }
} else if (result.frequency > LOWER_FREQ_24GHZ if (n5 < 4) {
&& result.frequency < HIGHER_FREQ_24GHZ) { if (scans5GHz == null) scans5GHz = new StringBuilder();
scans5GHz.append(" {").append(result.BSSID);
scans5GHz.append("=").append(result.frequency);
scans5GHz.append(",").append(result.level).append("}");
n5++;
}
} else if (result.frequency >= LOWER_FREQ_24GHZ
&& result.frequency <= HIGHER_FREQ_24GHZ) {
if (result.level > rssi24) { if (result.level > rssi24) {
rssi24 = result.level; rssi24 = result.level;
} }
if (n24 < 4) {
if (scans24GHz == null) scans24GHz = new StringBuilder();
scans24GHz.append(" {").append(result.BSSID);
scans24GHz.append("=").append(result.frequency);
scans24GHz.append(",").append(result.level).append("}");
n24++;
}
} }
} }
visibility.append(" ["); visibility.append(" [");
if (num24 > 0 || rssi24 > WifiConfiguration.INVALID_RSSI) { if (num24 > 0) {
visibility.append(Integer.toString(rssi24)); visibility.append("(").append(num24).append(")");
visibility.append(","); if (n24 <= 4) {
visibility.append(Integer.toString(num24)); if (scans24GHz != null) {
visibility.append(scans24GHz.toString());
}
} else {
visibility.append("max=").append(rssi24);
if (scans24GHz != null) {
visibility.append(",").append(scans24GHz.toString());
}
}
} }
visibility.append(";"); visibility.append(";");
if (num5 > 0 || rssi5 > WifiConfiguration.INVALID_RSSI) { if (num5 > 0) {
visibility.append(Integer.toString(rssi5)); visibility.append("(").append(num5).append(")");
visibility.append(","); if (n5 <= 4) {
visibility.append(Integer.toString(num5)); if (scans5GHz != null) {
visibility.append(scans5GHz.toString());
}
} else {
visibility.append("max=").append(rssi5);
if (scans5GHz != null) {
visibility.append(",").append(scans5GHz.toString());
}
}
} }
if (numBlackListed > 0) if (numBlackListed > 0)
visibility.append("!"); visibility.append("!").append(numBlackListed);
visibility.append("]"); visibility.append("]");
} else { } else {
if (mRssi != Integer.MAX_VALUE) { if (mRssi != Integer.MAX_VALUE) {
visibility.append(", ss="); visibility.append(" rssi=");
visibility.append(Integer.toString(mRssi)); visibility.append(mRssi);
if (mScanResult != null) { if (mScanResult != null) {
visibility.append(", "); visibility.append(", f=");
visibility.append(Integer.toString(mScanResult.frequency)); visibility.append(mScanResult.frequency);
} }
} }
} }