Merge "Log disabled networks only" into oc-dev

am: 90bdf19e29

Change-Id: I546a3b187b612d475c5f77e37256c219247f2217

1 files changed, 18 insertions, 23 deletions

diff --git a/service/java/com/android/server/wifi/SavedNetworkEvaluator.java b/service/java/com/android/server/wifi/SavedNetworkEvaluator.java
index 720afd5a7..9ac70689b 100644
--- a/service/java/com/android/server/wifi/SavedNetworkEvaluator.java
+++ b/service/java/com/android/server/wifi/SavedNetworkEvaluator.java
@@ -107,9 +107,6 @@ public class SavedNetworkEvaluator implements WifiNetworkSelector.NetworkEvaluat
                 continue;
             }
 
-            WifiConfiguration.NetworkSelectionStatus status =
-                    network.getNetworkSelectionStatus();
-
             // If a configuration is temporarily disabled, re-enable it before trying
             // to connect to it.
             mWifiConfigManager.tryEnableNetwork(network.networkId);
@@ -120,28 +117,26 @@ public class SavedNetworkEvaluator implements WifiNetworkSelector.NetworkEvaluat
             // Clear the cached candidate, score and seen.
             mWifiConfigManager.clearNetworkCandidateScanResult(network.networkId);
 
-            boolean networkDisabled = false;
-            boolean networkStringLogged = false;
-            for (int index = WifiConfiguration.NetworkSelectionStatus
-                    .NETWORK_SELECTION_DISABLED_STARTING_INDEX;
-                    index < WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_DISABLED_MAX;
-                    index++) {
-                int count = status.getDisableReasonCounter(index);
-                if (count > 0) {
-                    networkDisabled = true;
-                    if (!networkStringLogged) {
-                        sbuf.append("  ").append(WifiNetworkSelector.toNetworkString(network))
-                                .append(" ");
-                        networkStringLogged = true;
+            // Log disabled network.
+            WifiConfiguration.NetworkSelectionStatus status = network.getNetworkSelectionStatus();
+            if (!status.isNetworkEnabled()) {
+                sbuf.append("  ").append(WifiNetworkSelector.toNetworkString(network)).append(" ");
+                for (int index = WifiConfiguration.NetworkSelectionStatus
+                            .NETWORK_SELECTION_DISABLED_STARTING_INDEX;
+                        index < WifiConfiguration.NetworkSelectionStatus
+                            .NETWORK_SELECTION_DISABLED_MAX;
+                        index++) {
+                    int count = status.getDisableReasonCounter(index);
+                    // Here we log the reason as long as its count is greater than zero. The
+                    // network may not be disabled because of this particular reason. Logging
+                    // this information anyway to help understand what happened to the network.
+                    if (count > 0) {
+                        sbuf.append("reason=")
+                                .append(WifiConfiguration.NetworkSelectionStatus
+                                        .getNetworkDisableReasonString(index))
+                                .append(", count=").append(count).append("; ");
                     }
-                    sbuf.append("reason=")
-                            .append(WifiConfiguration.NetworkSelectionStatus
-                                    .getNetworkDisableReasonString(index))
-                            .append(", count=").append(count).append("; ");
                 }
-            }
-
-            if (networkDisabled) {
                 sbuf.append("\n");
             }
         }