diff options
| author | Veerendranath Jakkam <quic_vjakkam@quicinc.com> | 2020-05-21 05:45:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-21 05:45:47 +0000 |
| commit | 7c56c6fe6b5dd22b4eeabb9271622aa727b435a2 (patch) | |
| tree | f3a010161a433470f61257a29940e92602cc9b4b /service | |
| parent | 94382ddb9151598ae7628d2415a993359d500351 (diff) | |
| parent | 516e7ac6142e95f18ec086f041015bcea0e6a59e (diff) | |
Add check to consider band in determining VHT capability am: 3280ce7359 am: 516e7ac614
Change-Id: I2e01c1ec54dbb9cb4d66f00333e67075b6f98e0b
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/util/InformationElementUtil.java | 6 |
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 { |