commit 7bd893f0ac37abab40b36e3b2fe123b20eb0cc12
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 11 11:06:22 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 11 11:06:22 2022 +0000
tree 7d5060069c6cee900d33c9a128c23d4c714de94f
parent fa1d0367700afaa9d1d9d2ecc284e269a621356c
parent 7f9ecc74b90b786310d879970e559530bb33dcf1

Snap for 8061698 from 7f9ecc74b90b786310d879970e559530bb33dcf1 to s-keystone-qcom-release

Change-Id: Ic00c8e254e3c0c5e56f5da7af233392dbbc8e101

libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java

diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
index b63c4dc..cbff162 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
@@ -1190,6 +1190,11 @@
 
             if (currResultWifiStandard < minConnectionCapability)
                 minConnectionCapability = currResultWifiStandard;
+            /*Do not include VHT support for 2ghz when device capability is 11AC
+              and AP operating in 11AX */
+            else if (result.is24GHz() && currResultWifiStandard == ScanResult.WIFI_STANDARD_11AX &&
+                     minConnectionCapability == ScanResult.WIFI_STANDARD_11AC)
+                minConnectionCapability = ScanResult.WIFI_STANDARD_11N;
         }
 
         mWifiStandard = minConnectionCapability;