Updates Metrics for Soft AP channel and bandwidth

Bug: 72643031
Test: tests/wifitests/runtests.sh
Change-Id: Idc6231e599a6c42c0e8720da8a289142ea368f90

3 files changed, 30 insertions, 1 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java b/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java
index 9a0e39999..e41af6867 100644
--- a/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java
@@ -39,6 +39,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.net.Uri;
+import android.net.wifi.IApInterfaceEventCallback;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.UserHandle;
@@ -626,6 +627,21 @@ public class SoftApManagerTest {
         verifyNoMoreInteractions(mContext, mCallback, mWifiNative);
     }
 
+    @Test
+    public void updatesMetricsOnChannelSwitchedEvent() throws Exception {
+        SoftApModeConfiguration apConfig =
+                new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null);
+        startSoftApAndVerifyEnabled(apConfig);
+
+        final int channelFrequency = 2437;
+        final int channelBandwidth = IApInterfaceEventCallback.BANDWIDTH_20;
+        mSoftApListenerCaptor.getValue().onSoftApChannelSwitched(channelFrequency,
+                channelBandwidth);
+        mLooper.dispatchAll();
+
+        verify(mWifiMetrics).addSoftApChannelSwitchedEvent(channelFrequency, channelBandwidth,
+                apConfig.getTargetMode());
+    }
 
     @Test
     public void updatesNumAssociatedStations() throws Exception {
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
index d823f5a50..dad12391d 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java
@@ -291,6 +291,8 @@ public class WifiMetricsTest {
 
     private static final int NUM_SOFT_AP_EVENT_ENTRIES = 3;
     private static final int NUM_SOFT_AP_ASSOCIATED_STATIONS = 3;
+    private static final int SOFT_AP_CHANNEL_FREQUENCY = 2437;
+    private static final int SOFT_AP_CHANNEL_BANDWIDTH = SoftApConnectedClientsEvent.BANDWIDTH_20;
 
     private ScanDetail buildMockScanDetail(boolean hidden, NetworkDetail.HSRelease hSRelease,
             String capabilities) {
@@ -619,7 +621,9 @@ public class WifiMetricsTest {
         mWifiMetrics.addSoftApNumAssociatedStationsChangedEvent(NUM_SOFT_AP_ASSOCIATED_STATIONS,
                 WifiManager.IFACE_IP_MODE_UNSPECIFIED);  // Should be dropped.
         mWifiMetrics.addSoftApUpChangedEvent(false, WifiManager.IFACE_IP_MODE_TETHERED);
-
+        // Channel switch info should be added to the last Soft AP UP event in the list
+        mWifiMetrics.addSoftApChannelSwitchedEvent(SOFT_AP_CHANNEL_FREQUENCY,
+                SOFT_AP_CHANNEL_BANDWIDTH, WifiManager.IFACE_IP_MODE_TETHERED);
         mWifiMetrics.addSoftApUpChangedEvent(true, WifiManager.IFACE_IP_MODE_LOCAL_ONLY);
         mWifiMetrics.addSoftApNumAssociatedStationsChangedEvent(NUM_SOFT_AP_ASSOCIATED_STATIONS,
                 WifiManager.IFACE_IP_MODE_LOCAL_ONLY);
@@ -634,6 +638,10 @@ public class WifiMetricsTest {
         assertEquals(SoftApConnectedClientsEvent.SOFT_AP_UP,
                 mDecodedProto.softApConnectedClientsEventsTethered[0].eventType);
         assertEquals(0, mDecodedProto.softApConnectedClientsEventsTethered[0].numConnectedClients);
+        assertEquals(SOFT_AP_CHANNEL_FREQUENCY,
+                mDecodedProto.softApConnectedClientsEventsTethered[0].channelFrequency);
+        assertEquals(SOFT_AP_CHANNEL_BANDWIDTH,
+                mDecodedProto.softApConnectedClientsEventsTethered[0].channelBandwidth);
         assertEquals(SoftApConnectedClientsEvent.NUM_CLIENTS_CHANGED,
                 mDecodedProto.softApConnectedClientsEventsTethered[1].eventType);
         assertEquals(NUM_SOFT_AP_ASSOCIATED_STATIONS,
diff --git a/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java b/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java
index 8336c03eb..bfa77d575 100644
--- a/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java
@@ -947,6 +947,11 @@ public class WificondControlTest {
         apInterfaceCallbackCaptor.getValue().onNumAssociatedStationsChanged(numStations);
         verify(mSoftApListener).onNumAssociatedStationsChanged(eq(numStations));
 
+        int channelFrequency = 2437;
+        int channelBandwidth = IApInterfaceEventCallback.BANDWIDTH_20;
+        apInterfaceCallbackCaptor.getValue().onSoftApChannelSwitched(channelFrequency,
+                channelBandwidth);
+        verify(mSoftApListener).onSoftApChannelSwitched(eq(channelFrequency), eq(channelBandwidth));
     }
 
     /**