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

Commit 76f63b7b authored by Eric Schwarzenbach's avatar Eric Schwarzenbach Committed by android-build-merger
Browse files

Merge "Only display RSSI/band information if network is connected." into oc-mr1-dev 

am: c7886489

Change-Id: I18be4be9f92d841cf5579ecde4fd6b73c860ee93
parents f4f779d5 c7886489

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -754,7 +754,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 
        if (WifiTracker.sVerboseLogging) {

        if (WifiTracker.sVerboseLogging) {

            // 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 (isActive() && mInfo != null) {

                summary.append(" f=" + Integer.toString(mInfo.getFrequency()));

                summary.append(" f=" + Integer.toString(mInfo.getFrequency()));

            }

            }

            summary.append(" " + getVisibilityStatus());

            summary.append(" " + getVisibilityStatus());
@@ -819,7 +819,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 




        long now = System.currentTimeMillis();

        long now = System.currentTimeMillis();





        if (mInfo != null) {

        if (isActive() && mInfo != null) {

            bssid = mInfo.getBSSID();

            bssid = mInfo.getBSSID();

            if (bssid != null) {

            if (bssid != null) {

                visibility.append(" ").append(bssid);

                visibility.append(" ").append(bssid);