Add mbo association retry delay metric

Add number of times STA received BSS transition
request including mbo association retry delay attribute.

Bug: 148164321
Test: atest com.android.server.wifi.WifiMetricsTest
Test: atest com.android.server.wifi.ClientModeImplTest
Test: Manual - Triggered mbo tests and verified the counters in dumpsys
Change-Id: Iec0a7e8cbaffc84ee694f0bee8486ace517134db

3 files changed, 16 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index 588564ed9..38a946b86 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -6113,6 +6113,7 @@ public class ClientModeImpl extends StateMachine {
                 & MboOceConstants.BTM_DATA_FLAG_MBO_ASSOC_RETRY_DELAY_INCLUDED)
                 != 0) {
             long duration = frameData.mBlackListDurationMs;
+            mWifiMetrics.incrementSteeringRequestCountIncludingMboAssocRetryDelay();
             if (duration == 0) {
                 /*
                  * When MBO assoc retry delay is set to zero(reserved as per spec),
diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java
index c563a4bfb..481fa20f7 100644
--- a/service/java/com/android/server/wifi/WifiMetrics.java
+++ b/service/java/com/android/server/wifi/WifiMetrics.java
@@ -3107,6 +3107,8 @@ public class WifiMetrics {
                         + mWifiLogProto.numForceScanDueToSteeringRequest);
                 pw.println("mWifiLogProto.numMboCellularSwitchRequest="
                         + mWifiLogProto.numMboCellularSwitchRequest);
+                pw.println("mWifiLogProto.numSteeringRequestIncludingMboAssocRetryDelay="
+                        + mWifiLogProto.numSteeringRequestIncludingMboAssocRetryDelay);
                 pw.println("mWifiLogProto.numConnectRequestWithFilsAkm="
                         + mWifiLogProto.numConnectRequestWithFilsAkm);
                 pw.println("mWifiLogProto.numL2ConnectionThroughFilsAuthentication="
@@ -5916,6 +5918,16 @@ public class WifiMetrics {
     }
 
     /**
+     * Increment number of times STA received steering request
+     * including MBO association retry delay.
+     */
+    public void incrementSteeringRequestCountIncludingMboAssocRetryDelay() {
+        synchronized (mLock) {
+            mWifiLogProto.numSteeringRequestIncludingMboAssocRetryDelay++;
+        }
+    }
+
+    /**
      * Increment number of connect request to AP adding FILS AKM.
      */
     public void incrementConnectRequestWithFilsAkmCount() {
diff --git a/service/proto/src/metrics.proto b/service/proto/src/metrics.proto
index 34eb283b4..12fc7bcc0 100644
--- a/service/proto/src/metrics.proto
+++ b/service/proto/src/metrics.proto
@@ -646,6 +646,9 @@ message WifiLog {
 
   // WiFi Tx and Rx throughput histogram at various RF bands
   optional ThroughputMbpsHistogram throughput_mbps_histogram = 180;
+
+  // Total number of steering requests which include MBO assoc retry delay
+  optional int32 num_steering_request_including_mbo_assoc_retry_delay = 181;
 }
 
 // Information that gets logged for every WiFi connection.