WifiLastResortWatchdog metrics

Added logging of various metrics to the WifiLastResortWatchdog. These
metrics count the number of times the Watchdog triggers, and stats
counting the number of networks present at failure time for different
failure types.

BUG=27856474

Change-Id: If43836b1c33791fefb8000196b231c312161feef

3 files changed, 135 insertions, 3 deletions

diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java
index c8f2fa896..cf65668d5 100644
--- a/service/java/com/android/server/wifi/WifiInjector.java
+++ b/service/java/com/android/server/wifi/WifiInjector.java
@@ -31,7 +31,8 @@ public class WifiInjector {
     }
 
     private final WifiMetrics mWifiMetrics = new WifiMetrics();
-    private final WifiLastResortWatchdog mWifiLastResortWatchdog = new WifiLastResortWatchdog();
+    private final WifiLastResortWatchdog mWifiLastResortWatchdog =
+            new WifiLastResortWatchdog(mWifiMetrics);
     private final Clock mClock = new Clock();
 
     public WifiMetrics getWifiMetrics() {
diff --git a/service/java/com/android/server/wifi/WifiLastResortWatchdog.java b/service/java/com/android/server/wifi/WifiLastResortWatchdog.java
index adb8771ea..a953404c5 100644
--- a/service/java/com/android/server/wifi/WifiLastResortWatchdog.java
+++ b/service/java/com/android/server/wifi/WifiLastResortWatchdog.java
@@ -78,6 +78,12 @@ public class WifiLastResortWatchdog {
     // successfully connecting or a new network (SSID) becomes available to connect to.
     private boolean mWatchdogAllowedToTrigger = true;
 
+    private WifiMetrics mWifiMetrics;
+
+    WifiLastResortWatchdog(WifiMetrics wifiMetrics) {
+        mWifiMetrics = wifiMetrics;
+    }
+
     /**
      * Refreshes recentAvailableNetworks with the latest available networks
      * Adds new networks, removes old ones that have timed out. Should be called after Wifi
@@ -325,11 +331,35 @@ public class WifiLastResortWatchdog {
     }
 
     /**
-     * Update WifiMetrics with various Watchdog stats (trigger counts, tracked network count)
+     * Update WifiMetrics with various Watchdog stats (trigger counts, failed network counts)
      */
     private void incrementWifiMetricsTriggerCounts() {
         if (VDBG) Log.v(TAG, "incrementWifiMetricsTriggerCounts.");
-        // <TODO>
+        mWifiMetrics.incrementNumLastResortWatchdogTriggers();
+        mWifiMetrics.addCountToNumLastResortWatchdogAvailableNetworksTotal(
+                mSsidFailureCount.size());
+        // Number of networks over each failure type threshold, present at trigger time
+        int badAuth = 0;
+        int badAssoc = 0;
+        int badDhcp = 0;
+        for (Map.Entry<String, Pair<AvailableNetworkFailureCount, Integer>> entry
+                : mSsidFailureCount.entrySet()) {
+            badAuth += (entry.getValue().first.authenticationFailure >= FAILURE_THRESHOLD) ? 1 : 0;
+            badAssoc += (entry.getValue().first.associationRejection >= FAILURE_THRESHOLD) ? 1 : 0;
+            badDhcp += (entry.getValue().first.dhcpFailure >= FAILURE_THRESHOLD) ? 1 : 0;
+        }
+        if (badAuth > 0) {
+            mWifiMetrics.addCountToNumLastResortWatchdogBadAuthenticationNetworksTotal(badAuth);
+            mWifiMetrics.incrementNumLastResortWatchdogTriggersWithBadAuthentication();
+        }
+        if (badAssoc > 0) {
+            mWifiMetrics.addCountToNumLastResortWatchdogBadAssociationNetworksTotal(badAssoc);
+            mWifiMetrics.incrementNumLastResortWatchdogTriggersWithBadAssociation();
+        }
+        if (badDhcp > 0) {
+            mWifiMetrics.addCountToNumLastResortWatchdogBadDhcpNetworksTotal(badDhcp);
+            mWifiMetrics.incrementNumLastResortWatchdogTriggersWithBadDhcp();
+        }
     }
 
     /**
diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java
index ccc58ec96..f3ab02c24 100644
--- a/service/java/com/android/server/wifi/WifiMetrics.java
+++ b/service/java/com/android/server/wifi/WifiMetrics.java
@@ -671,6 +671,87 @@ public class WifiMetrics {
     }
 
     /**
+     * Increment number of times the Watchdog of Last Resort triggered, resetting the wifi stack
+     */
+    public void incrementNumLastResortWatchdogTriggers() {
+        synchronized (mLock) {
+            mWifiLogProto.numLastResortWatchdogTriggers++;
+        }
+    }
+    /**
+     * @param count number of networks over bad association threshold when watchdog triggered
+     */
+    public void addCountToNumLastResortWatchdogBadAssociationNetworksTotal(int count) {
+        synchronized (mLock) {
+            mWifiLogProto.numLastResortWatchdogBadAssociationNetworksTotal += count;
+        }
+    }
+    /**
+     * @param count number of networks over bad authentication threshold when watchdog triggered
+     */
+    public void addCountToNumLastResortWatchdogBadAuthenticationNetworksTotal(int count) {
+        synchronized (mLock) {
+            mWifiLogProto.numLastResortWatchdogBadAuthenticationNetworksTotal += count;
+        }
+    }
+    /**
+     * @param count number of networks over bad dhcp threshold when watchdog triggered
+     */
+    public void addCountToNumLastResortWatchdogBadDhcpNetworksTotal(int count) {
+        synchronized (mLock) {
+            mWifiLogProto.numLastResortWatchdogBadDhcpNetworksTotal += count;
+        }
+    }
+    /**
+     * @param count number of networks over bad other threshold when watchdog triggered
+     */
+    public void addCountToNumLastResortWatchdogBadOtherNetworksTotal(int count) {
+        synchronized (mLock) {
+            mWifiLogProto.numLastResortWatchdogBadOtherNetworksTotal += count;
+        }
+    }
+    /**
+     * @param count number of networks seen when watchdog triggered
+     */
+    public void addCountToNumLastResortWatchdogAvailableNetworksTotal(int count) {
+        synchronized (mLock) {
+            mWifiLogProto.numLastResortWatchdogAvailableNetworksTotal += count;
+        }
+    }
+    /**
+     * Increment count of triggers with atleast one bad association network
+     */
+    public void incrementNumLastResortWatchdogTriggersWithBadAssociation() {
+        synchronized (mLock) {
+            mWifiLogProto.numLastResortWatchdogTriggersWithBadAssociation++;
+        }
+    }
+    /**
+     * Increment count of triggers with atleast one bad authentication network
+     */
+    public void incrementNumLastResortWatchdogTriggersWithBadAuthentication() {
+        synchronized (mLock) {
+            mWifiLogProto.numLastResortWatchdogTriggersWithBadAuthentication++;
+        }
+    }
+    /**
+     * Increment count of triggers with atleast one bad dhcp network
+     */
+    public void incrementNumLastResortWatchdogTriggersWithBadDhcp() {
+        synchronized (mLock) {
+            mWifiLogProto.numLastResortWatchdogTriggersWithBadDhcp++;
+        }
+    }
+    /**
+     * Increment count of triggers with atleast one bad other network
+     */
+    public void incrementNumLastResortWatchdogTriggersWithBadOther() {
+        synchronized (mLock) {
+            mWifiLogProto.numLastResortWatchdogTriggersWithBadOther++;
+        }
+    }
+
+    /**
      * Increment number of times connectivity watchdog confirmed pno is working
      */
     public void incrementNumConnectivityWatchdogPnoGood() {
@@ -798,6 +879,26 @@ public class WifiMetrics {
                         + mWifiLogProto.numConnectivityWatchdogBackgroundGood);
                 pw.println("mWifiLogProto.numConnectivityWatchdogBackgroundBad="
                         + mWifiLogProto.numConnectivityWatchdogBackgroundBad);
+                pw.println("mWifiLogProto.numLastResortWatchdogTriggers="
+                        + mWifiLogProto.numLastResortWatchdogTriggers);
+                pw.println("mWifiLogProto.numLastResortWatchdogBadAssociationNetworksTotal="
+                        + mWifiLogProto.numLastResortWatchdogBadAssociationNetworksTotal);
+                pw.println("mWifiLogProto.numLastResortWatchdogBadAuthenticationNetworksTotal="
+                        + mWifiLogProto.numLastResortWatchdogBadAuthenticationNetworksTotal);
+                pw.println("mWifiLogProto.numLastResortWatchdogBadDhcpNetworksTotal="
+                        + mWifiLogProto.numLastResortWatchdogBadDhcpNetworksTotal);
+                pw.println("mWifiLogProto.numLastResortWatchdogBadOtherNetworksTotal="
+                        + mWifiLogProto.numLastResortWatchdogBadOtherNetworksTotal);
+                pw.println("mWifiLogProto.numLastResortWatchdogAvailableNetworksTotal="
+                        + mWifiLogProto.numLastResortWatchdogAvailableNetworksTotal);
+                pw.println("mWifiLogProto.numLastResortWatchdogTriggersWithBadAssociation="
+                        + mWifiLogProto.numLastResortWatchdogTriggersWithBadAssociation);
+                pw.println("mWifiLogProto.numLastResortWatchdogTriggersWithBadAuthentication="
+                        + mWifiLogProto.numLastResortWatchdogTriggersWithBadAuthentication);
+                pw.println("mWifiLogProto.numLastResortWatchdogTriggersWithBadDhcp="
+                        + mWifiLogProto.numLastResortWatchdogTriggersWithBadDhcp);
+                pw.println("mWifiLogProto.numLastResortWatchdogTriggersWithBadOther="
+                        + mWifiLogProto.numLastResortWatchdogTriggersWithBadOther);
             }
         }
     }