diff options
| author | Veerendranath Jakkam <quic_vjakkam@quicinc.com> | 2020-05-21 05:30:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-21 05:30:58 +0000 |
| commit | 516e7ac6142e95f18ec086f041015bcea0e6a59e (patch) | |
| tree | f344dfc4be76afcc75ab4fa5f4a8eef3db83671f /service | |
| parent | 9f4633944734f0205ebf16c205147f7d21ad6f3d (diff) | |
| parent | 3280ce7359f081628980661afc46890bd90a71c9 (diff) | |
Add check to consider band in determining VHT capability am: 3280ce7359
Change-Id: I7c8db958506247612657b9b5225ea672b29b32aa
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 { |