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 automerge: 53ad50b

Browse Source 
automerge: 4f2c003

* commit '4f2c003d6ae0db4b6d929e2de5e40d7ab01a76dc':
  dont blacklist wifi config that have had validated internet status in the past
This commit is contained in:
vandwalle
2014-11-12 03:24:47 +00:00
committed by android-build-merger
parent 324cabb2d8 4f2c003d6a
commit bf1dcec15f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -616,9 +616,10 @@ class AccessPoint extends Preference {
// Update to new summary
StringBuilder summary = new StringBuilder();
if (isActive()) {
if (isActive()) { // This is the active connection
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));
} else if (mConfig != null && ((mConfig.status == WifiConfiguration.Status.DISABLED &&
mConfig.disableReason != WifiConfiguration.DISABLED_UNKNOWN_REASON)
@@ -657,8 +658,8 @@ class AccessPoint extends Preference {
}
if (WifiSettings.mVerboseLogging > 0) {
//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
// 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
if (mInfo != null && mNetworkInfo != null) { // This is the active connection
summary.append(" f=" + Integer.toString(mInfo.getFrequency()));
}
@@ -687,6 +688,9 @@ class AccessPoint extends Preference {
if (mConfig != null && mConfig.numAuthFailures > 0) {
summary.append(" authf=").append(mConfig.numAuthFailures);
}
if (mConfig != null && mConfig.numNoInternetAccessReports > 0) {
summary.append(" noInt=").append(mConfig.numNoInternetAccessReports);
}
}
if (summary.length() > 0) {