Merge "Metrics: count num scan requests with DFS channels"

2 files changed, 26 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java
index 6cd1ad3ce..86b881951 100644
--- a/service/java/com/android/server/wifi/WifiMetrics.java
+++ b/service/java/com/android/server/wifi/WifiMetrics.java
@@ -899,6 +899,15 @@ public class WifiMetrics {
     }
 
     /**
+     * Increment the count of oneshot scans that include DFS channels.
+     */
+    public void incrementOneshotScanWithDfsCount() {
+        synchronized (mLock) {
+            mWifiLogProto.numOneshotHasDfsChannelScans++;
+        }
+    }
+
+    /**
      * Increment connectivity oneshot scan count.
      */
     public void incrementConnectivityOneshotScanCount() {
@@ -926,6 +935,15 @@ public class WifiMetrics {
     }
 
     /**
+     * Get the count of oneshot scan requests that included DFS channels.
+     */
+    public int getOneshotScanWithDfsCount() {
+        synchronized (mLock) {
+            return mWifiLogProto.numOneshotHasDfsChannelScans;
+        }
+    }
+
+    /**
      * Increment oneshot scan count for external apps.
      */
     public void incrementExternalAppOneshotScanRequestsCount() {
@@ -1945,6 +1963,8 @@ public class WifiMetrics {
                         + mWifiLogProto.numConnectivityOneshotScans);
                 pw.println("mWifiLogProto.numOneshotScans="
                         + mWifiLogProto.numOneshotScans);
+                pw.println("mWifiLogProto.numOneshotHasDfsChannelScans="
+                        + mWifiLogProto.numOneshotHasDfsChannelScans);
                 pw.println("mWifiLogProto.numBackgroundScans="
                         + mWifiLogProto.numBackgroundScans);
                 pw.println("mWifiLogProto.numExternalAppOneshotScanRequests="
diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
index 4b89c327b..521b68e69 100644
--- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
+++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
@@ -599,7 +599,6 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub {
                         // Ignore if we're already in driver loaded state.
                         return HANDLED;
                     case WifiScanner.CMD_START_SINGLE_SCAN:
-                        mWifiMetrics.incrementOneshotScanCount();
                         int handler = msg.arg2;
                         Bundle scanParams = (Bundle) msg.obj;
                         if (scanParams == null) {
@@ -613,6 +612,12 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub {
                         WorkSource workSource =
                                 scanParams.getParcelable(WifiScanner.SCAN_PARAMS_WORK_SOURCE_KEY);
                         if (validateScanRequest(ci, handler, scanSettings)) {
+                            mWifiMetrics.incrementOneshotScanCount();
+                            if (scanSettings.band == WifiScanner.WIFI_BAND_5_GHZ_DFS_ONLY
+                                    || scanSettings.band == WifiScanner.WIFI_BAND_5_GHZ_WITH_DFS
+                                    || scanSettings.band == WifiScanner.WIFI_BAND_BOTH_WITH_DFS) {
+                                mWifiMetrics.incrementOneshotScanWithDfsCount();
+                            }
                             logScanRequest("addSingleScanRequest", ci, handler, workSource,
                                     scanSettings, null);
                             replySucceeded(msg);