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

Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev

Browse Source
This commit is contained in:
vandwalle
2014-11-12 01:18:37 +00:00
committed by Android (Google) Code Review
parent 588611eea5 8be7ee3aac
commit 53ad50b05b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -616,9 +616,10 @@ class AccessPoint extends Preference {
// Update to new summary // Update to new summary
StringBuilder summary = new StringBuilder(); StringBuilder summary = new StringBuilder();
if (isActive()) { if (isActive()) { // This is the active connection
summary.append(Summary.get(context, getState())); summary.append(Summary.get(context, getState()));
} else if (mConfig != null && mConfig.noInternetAccess) { } else if (mConfig != null
&& mConfig.hasNoInternetAccess()) {
summary.append(context.getString(R.string.wifi_no_internet)); summary.append(context.getString(R.string.wifi_no_internet));
} else if (mConfig != null && ((mConfig.status == WifiConfiguration.Status.DISABLED && } else if (mConfig != null && ((mConfig.status == WifiConfiguration.Status.DISABLED &&
mConfig.disableReason != WifiConfiguration.DISABLED_UNKNOWN_REASON) mConfig.disableReason != WifiConfiguration.DISABLED_UNKNOWN_REASON)
@@ -657,7 +658,7 @@ class AccessPoint extends Preference {
} }
if (WifiSettings.mVerboseLogging > 0) { if (WifiSettings.mVerboseLogging > 0) {
//add RSSI/band information for this config, what was seen up to 6 seconds ago // Add RSSI/band information for this config, what was seen up to 6 seconds ago
// verbose WiFi Logging is only turned on thru developers settings // verbose WiFi Logging is only turned on thru developers settings
if (mInfo != null && mNetworkInfo != null) { // This is the active connection if (mInfo != null && mNetworkInfo != null) { // This is the active connection
summary.append(" f=" + Integer.toString(mInfo.getFrequency())); summary.append(" f=" + Integer.toString(mInfo.getFrequency()));
@@ -687,6 +688,9 @@ class AccessPoint extends Preference {
if (mConfig != null && mConfig.numAuthFailures > 0) { if (mConfig != null && mConfig.numAuthFailures > 0) {
summary.append(" authf=").append(mConfig.numAuthFailures); summary.append(" authf=").append(mConfig.numAuthFailures);
} }
if (mConfig != null && mConfig.numNoInternetAccessReports > 0) {
summary.append(" noInt=").append(mConfig.numNoInternetAccessReports);
}
} }
if (summary.length() > 0) { if (summary.length() > 0) {