Merge "WifiMetrics: Add methods to increment new hal/cond metrics" into oc-dev

am: 78156cd914

Change-Id: I8a09a1176d5cbaac72d341dfa1cdff7f5a05236c

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
index 4d9c906ea..1c09cac38 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
@@ -231,6 +231,10 @@ public class WifiMetricsTest {
     private static final int NUM_SOFTAP_START_SUCCESS = 3;
     private static final int NUM_SOFTAP_FAILED_GENERAL_ERROR = 2;
     private static final int NUM_SOFTAP_FAILED_NO_CHANNEL = 1;
+    private static final int NUM_HAL_CRASHES = 11;
+    private static final int NUM_WIFICOND_CRASHES = 12;
+    private static final int NUM_WIFI_ON_FAILURE_DUE_TO_HAL = 13;
+    private static final int NUM_WIFI_ON_FAILURE_DUE_TO_WIFICOND = 14;
 
     private ScanDetail buildMockScanDetail(boolean hidden, NetworkDetail.HSRelease hSRelease,
             String capabilities) {
@@ -403,6 +407,18 @@ public class WifiMetricsTest {
             mWifiMetrics.incrementSoftApStartResult(false,
                     WifiManager.SAP_START_FAILURE_NO_CHANNEL);
         }
+        for (int i = 0; i < NUM_HAL_CRASHES; i++) {
+            mWifiMetrics.incrementNumHalCrashes();
+        }
+        for (int i = 0; i < NUM_WIFICOND_CRASHES; i++) {
+            mWifiMetrics.incrementNumWificondCrashes();
+        }
+        for (int i = 0; i < NUM_WIFI_ON_FAILURE_DUE_TO_HAL; i++) {
+            mWifiMetrics.incrementNumWifiOnFailureDueToHal();
+        }
+        for (int i = 0; i < NUM_WIFI_ON_FAILURE_DUE_TO_WIFICOND; i++) {
+            mWifiMetrics.incrementNumWifiOnFailureDueToWificond();
+        }
     }
 
     /**
@@ -539,6 +555,12 @@ public class WifiMetricsTest {
                      mDeserializedWifiMetrics.softApReturnCode[2].startResult);
         assertEquals(NUM_SOFTAP_FAILED_NO_CHANNEL,
                      mDeserializedWifiMetrics.softApReturnCode[2].count);
+        assertEquals(NUM_HAL_CRASHES, mDeserializedWifiMetrics.numHalCrashes);
+        assertEquals(NUM_WIFICOND_CRASHES, mDeserializedWifiMetrics.numWificondCrashes);
+        assertEquals(NUM_WIFI_ON_FAILURE_DUE_TO_HAL,
+                mDeserializedWifiMetrics.numWifiOnFailureDueToHal);
+        assertEquals(NUM_WIFI_ON_FAILURE_DUE_TO_WIFICOND,
+                mDeserializedWifiMetrics.numWifiOnFailureDueToWificond);
     }
 
     /**