summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmed ElArabawy <arabawy@google.com>2020-06-03 21:25:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 21:25:32 +0000
commitdefba844ca1f1090dd9c09c98898b107977d4b4b (patch)
tree9583aca2fe46fca6486ff36fcff6b96bd5001455
parent7afec38351f7c565ea644002a6e80f5c83fcbe45 (diff)
parent80980838325ad4bf6bf59ce62ad2fe4af14fc9b1 (diff)
Merge "Wifi: Add 6GHz band to getWifiBand method" into rvc-dev am: 8098083832
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11688803 Change-Id: I0bce5e1af88e814ffd4779dfc434bfc2500e278a
-rw-r--r--src/com/android/networkstack/metrics/DataStallDetectionStats.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/networkstack/metrics/DataStallDetectionStats.java b/src/com/android/networkstack/metrics/DataStallDetectionStats.java
index d294e04..4de2ec0 100644
--- a/src/com/android/networkstack/metrics/DataStallDetectionStats.java
+++ b/src/com/android/networkstack/metrics/DataStallDetectionStats.java
@@ -261,11 +261,13 @@ public final class DataStallDetectionStats {
if (info == null) return DataStallEventProto.AP_BAND_UNKNOWN;
int freq = info.getFrequency();
- // Refer to ScanResult.is5GHz() and ScanResult.is24GHz().
- if (freq > 4900 && freq < 5900) {
+ // Refer to ScanResult.is5GHz(), ScanResult.is24GHz() and ScanResult.is6GHz().
+ if (freq >= 5160 && freq <= 5865) {
return DataStallEventProto.AP_BAND_5GHZ;
- } else if (freq > 2400 && freq < 2500) {
+ } else if (freq >= 2412 && freq <= 2484) {
return DataStallEventProto.AP_BAND_2GHZ;
+ } else if (freq >= 5945 && freq <= 7105) {
+ return DataStallEventProto.AP_BAND_6GHZ;
} else {
return DataStallEventProto.AP_BAND_UNKNOWN;
}