Merge "Wifi: add enterprise connection metrics" into rvc-dev

2 files changed, 23 insertions, 1 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java
index 64c6e0794..ad2eac8a8 100644
--- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java
@@ -146,6 +146,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest {
     private @Mock SupplicantStaNetworkHal mSupplicantStaNetworkMock;
     private @Mock WifiNative.SupplicantDeathEventHandler mSupplicantHalDeathHandler;
     private @Mock Clock mClock;
+    private @Mock WifiMetrics mWifiMetrics;
 
     SupplicantStatus mStatusSuccess;
     SupplicantStatus mStatusFailure;
@@ -177,7 +178,7 @@ public class SupplicantStaIfaceHalTest extends WifiBaseTest {
     private class SupplicantStaIfaceHalSpy extends SupplicantStaIfaceHal {
         SupplicantStaIfaceHalSpy() {
             super(mContext, mWifiMonitor, mFrameworkFacade,
-                    mHandler, mClock);
+                    mHandler, mClock, mWifiMetrics);
         }
 
         @Override
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
index eca775501..7dfe4c030 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
@@ -1436,6 +1436,7 @@ public class WifiMetricsTest extends WifiBaseTest {
         config.enterpriseConfig = new WifiEnterpriseConfig();
         config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TTLS);
         config.enterpriseConfig.setPhase2Method(WifiEnterpriseConfig.Phase2.MSCHAPV2);
+        config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_REQUIRE_CERT_STATUS);
         WifiConfiguration.NetworkSelectionStatus networkSelectionStat =
                 mock(WifiConfiguration.NetworkSelectionStatus.class);
         when(networkSelectionStat.getCandidate()).thenReturn(scanResult);
@@ -1480,6 +1481,8 @@ public class WifiMetricsTest extends WifiBaseTest {
                 mDecodedProto.connectionEvent[0].routerFingerprint.eapMethod);
         assertEquals(WifiMetricsProto.RouterFingerPrint.TYPE_PHASE2_MSCHAPV2,
                 mDecodedProto.connectionEvent[0].routerFingerprint.authPhase2Method);
+        assertEquals(WifiMetricsProto.RouterFingerPrint.TYPE_OCSP_REQUIRE_CERT_STATUS,
+                mDecodedProto.connectionEvent[0].routerFingerprint.ocspType);
         assertEquals(SCAN_RESULT_LEVEL, mDecodedProto.connectionEvent[0].signalStrength);
         assertEquals(NETWORK_DETAIL_DTIM, mDecodedProto.connectionEvent[1].routerFingerprint.dtim);
         assertEquals(WifiMetricsProto.RouterFingerPrint.AUTH_OPEN,
@@ -1488,6 +1491,8 @@ public class WifiMetricsTest extends WifiBaseTest {
                 mDecodedProto.connectionEvent[1].routerFingerprint.eapMethod);
         assertEquals(WifiMetricsProto.RouterFingerPrint.TYPE_PHASE2_NONE,
                 mDecodedProto.connectionEvent[1].routerFingerprint.authPhase2Method);
+        assertEquals(WifiMetricsProto.RouterFingerPrint.TYPE_OCSP_NONE,
+                mDecodedProto.connectionEvent[1].routerFingerprint.ocspType);
         assertEquals(SCAN_RESULT_LEVEL, mDecodedProto.connectionEvent[1].signalStrength);
         assertEquals(NETWORK_DETAIL_WIFIMODE,
                 mDecodedProto.connectionEvent[1].routerFingerprint.routerTechnology);
@@ -2493,6 +2498,22 @@ public class WifiMetricsTest extends WifiBaseTest {
     }
 
     /**
+     * Check pmk cache
+     */
+    @Test
+    public void testConnectionWithPmkCache() throws Exception {
+        mWifiMetrics.startConnectionEvent(mTestWifiConfig, "TestNetwork",
+                WifiMetricsProto.ConnectionEvent.ROAM_ENTERPRISE);
+        mWifiMetrics.setConnectionPmkCache(true);
+        mWifiMetrics.endConnectionEvent(
+                WifiMetrics.ConnectionEvent.FAILURE_NONE,
+                WifiMetricsProto.ConnectionEvent.HLF_NONE,
+                WifiMetricsProto.ConnectionEvent.FAILURE_REASON_UNKNOWN);
+        dumpProtoAndDeserialize();
+        assertEquals(true, mDecodedProto.connectionEvent[0].routerFingerprint.pmkCacheEnabled);
+    }
+
+    /**
      * Check ScoringParams
      */
     @Test