diff options
| author | Ahmed ElArabawy <arabawy@google.com> | 2020-04-09 14:40:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-09 14:40:03 +0000 |
| commit | e452e6a22830d3ff9e1b86cd6437afcb8df3e4d7 (patch) | |
| tree | 1fd539c8bb3d30577680e01257185b047ced847f /service | |
| parent | d08f153fa1287b5dffd0e9dffc34baf19f23dfbb (diff) | |
| parent | 7d92be3388a4dca08da2eaef061cb9b763e29f43 (diff) | |
Merge "Add metrics for 6G and 11ax scan results" into rvc-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMetrics.java | 14 | ||||
| -rw-r--r-- | service/proto/src/metrics.proto | 6 |
2 files changed, 20 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java index 9a75a5f45..3f13e99fc 100644 --- a/service/java/com/android/server/wifi/WifiMetrics.java +++ b/service/java/com/android/server/wifi/WifiMetrics.java @@ -2190,6 +2190,8 @@ public class WifiMetrics { int mboCellularDataAwareNetworks = 0; int oceSupportedNetworks = 0; int filsSupportedNetworks = 0; + int band6gNetworks = 0; + int standard11axNetworks = 0; for (ScanDetail scanDetail : scanDetails) { NetworkDetail networkDetail = scanDetail.getNetworkDetail(); @@ -2215,12 +2217,18 @@ public class WifiMetrics { oceSupportedNetworks++; } } + if (networkDetail.getWifiMode() == InformationElementUtil.WifiMode.MODE_11AX) { + standard11axNetworks++; + } } if (scanResult != null && scanResult.capabilities != null) { if (ScanResultUtil.isScanResultForFilsSha256Network(scanResult) || ScanResultUtil.isScanResultForFilsSha384Network(scanResult)) { filsSupportedNetworks++; } + if (scanResult.is6GHz()) { + band6gNetworks++; + } if (ScanResultUtil.isScanResultForEapSuiteBNetwork(scanResult)) { wpa3EnterpriseNetworks++; } else if (ScanResultUtil.isScanResultForWapiPskNetwork(scanResult)) { @@ -2258,6 +2266,8 @@ public class WifiMetrics { mWifiLogProto.numMboCellularDataAwareNetworkScanResults += mboCellularDataAwareNetworks; mWifiLogProto.numOceSupportedNetworkScanResults += oceSupportedNetworks; mWifiLogProto.numFilsSupportedNetworkScanResults += filsSupportedNetworks; + mWifiLogProto.num11AxNetworkScanResults += standard11axNetworks; + mWifiLogProto.num6GNetworkScanResults += band6gNetworks; mWifiLogProto.numScans++; } } @@ -3113,6 +3123,10 @@ public class WifiMetrics { + mWifiLogProto.numOceSupportedNetworkScanResults); pw.println("mWifiLogProto.numFilsSupportedNetworkScanResults=" + mWifiLogProto.numFilsSupportedNetworkScanResults); + pw.println("mWifiLogProto.num11AxNetworkScanResults=" + + mWifiLogProto.num11AxNetworkScanResults); + pw.println("mWifiLogProto.num6GNetworkScanResults" + + mWifiLogProto.num6GNetworkScanResults); pw.println("mWifiLogProto.numBssidFilteredDueToMboAssocDisallowInd=" + mWifiLogProto.numBssidFilteredDueToMboAssocDisallowInd); pw.println("mWifiLogProto.numConnectToNetworkSupportingMbo=" diff --git a/service/proto/src/metrics.proto b/service/proto/src/metrics.proto index 1c9ea37d8..e0061f44d 100644 --- a/service/proto/src/metrics.proto +++ b/service/proto/src/metrics.proto @@ -649,6 +649,12 @@ message WifiLog { // Total number of steering requests which include MBO assoc retry delay optional int32 num_steering_request_including_mbo_assoc_retry_delay = 181; + + // Total number of scan results from 11ax network + optional int32 num_11ax_network_scan_results = 182; + + // Total number of scan results from 6GHz band + optional int32 num_6g_network_scan_results = 183; } // Information that gets logged for every WiFi connection. |