summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/util/InformationElementUtil.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/util/InformationElementUtil.java b/service/java/com/android/server/wifi/util/InformationElementUtil.java
index 091707a7a..0b10bf45e 100644
--- a/service/java/com/android/server/wifi/util/InformationElementUtil.java
+++ b/service/java/com/android/server/wifi/util/InformationElementUtil.java
@@ -1494,13 +1494,15 @@ public class InformationElementUtil {
boolean foundVht, boolean foundHt, boolean foundErp) {
if (foundHe) {
return MODE_11AX;
- } else if (foundVht) {
+ } else if (!ScanResult.is24GHz(frequency) && foundVht) {
+ // Do not include subset of VHT on 2.4 GHz vendor extension
+ // in consideration for reporting VHT.
return MODE_11AC;
} else if (foundHt) {
return MODE_11N;
} else if (foundErp) {
return MODE_11G;
- } else if (frequency < 3000) {
+ } else if (ScanResult.is24GHz(frequency)) {
if (maxRate < 24000000) {
return MODE_11B;
} else {