Merge "WifiMetrics: Send a different error code for assoc timeout" into pi-dev

1 files changed, 20 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 07737b281..c31ecb03d 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
@@ -1047,6 +1047,26 @@ public class WifiMetricsTest {
     }
 
     /**
+     * Test that WifiMetrics is serializing/deserializing association time out events.
+     */
+    @Test
+    public void testMetricsAssociationTimedOut() throws Exception {
+        mWifiMetrics.startConnectionEvent(null, "RED",
+                WifiMetricsProto.ConnectionEvent.ROAM_NONE);
+        mWifiMetrics.endConnectionEvent(
+                WifiMetrics.ConnectionEvent.FAILURE_ASSOCIATION_TIMED_OUT,
+                WifiMetricsProto.ConnectionEvent.HLF_NONE);
+
+        //Dump proto and deserialize
+        //This should clear all the metrics in mWifiMetrics,
+        dumpProtoAndDeserialize();
+        //Check there is only 1 connection events
+        assertEquals(mDecodedProto.connectionEvent.length, 1);
+        assertEquals(mDecodedProto.connectionEvent[0].level2FailureCode,
+                WifiMetrics.ConnectionEvent.FAILURE_ASSOCIATION_TIMED_OUT);
+    }
+
+    /**
      * Test that WifiMetrics is being cleared after dumping via proto
      */
     @Test