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

Commit 53ad50b0 authored by vandwalle's avatar vandwalle Committed by Android (Google) Code Review
Browse files

Merge "dont blacklist wifi config that have had validated internet status in... 

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

src/com/android/settings/wifi/AccessPoint.java

+8 −4
Original line number Diff line number Diff line
@@ -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,7 +658,7 @@ class AccessPoint extends Preference { 
        }



        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

            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) {