Disabled the code to get P2P2 feature set
Open source commit - f02e1d777471a5ceb5acaa759daa562c6cb96e3c
enabled WFD R2 and PCC mode by default for all drivers. But in reality none
of the chipsets support this feature. So disabled the code to get the
P2P features (WFDR2 and PCC mode for now) from AIDL implementation.
This is mainly to fix the CTS failures. The code can be enabled once
wpa_supplicant implement the feature capability flag for all driver
implementations.
Bug: 405517969
Bug: 405502629
Bug: 388057182
Test: atest android.net.wifi.cts.ConcurrencyTest#testUsdBasedLocalServiceAdvertisement
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a693369ab5942a291ec94864ea390024e6f93512)
Merged-In: I8d1da4d8c4fd6fca268e9267b222e61d83799630
Change-Id: I8d1da4d8c4fd6fca268e9267b222e61d83799630
diff --git a/wpa_supplicant/aidl/vendor/p2p_iface.cpp b/wpa_supplicant/aidl/vendor/p2p_iface.cpp
index 2d8fa81..cbdf342 100644
--- a/wpa_supplicant/aidl/vendor/p2p_iface.cpp
+++ b/wpa_supplicant/aidl/vendor/p2p_iface.cpp
@@ -2135,6 +2135,10 @@
std::pair<int64_t, ndk::ScopedAStatus> P2pIface::getFeatureSetInternal()
{
+ // By default, core supplicant enable WFD R2 and PCC mode for all drivers.
+ // TODO Enable this code once core supplicant implement the configuration flag
+ // to enable/disable the feature for all driver implementations.
+#if 0
int64_t featureSet = 0;
struct wpa_supplicant* wpa_s = retrieveIfacePtr();
@@ -2145,6 +2149,9 @@
featureSet |= ISupplicantP2pIface::P2P_FEATURE_PCC_MODE_WPA3_COMPATIBILITY;
}
return {featureSet, ndk::ScopedAStatus::ok()};
+#else
+ return {0, ndk::ScopedAStatus::ok()};
+#endif
}
std::pair<uint32_t, ndk::ScopedAStatus>