Merge cherrypicks of ['googleplex-android-review.googlesource.com/32639524'] into 25Q2-release.
Change-Id: I1a64063b706cc6570bcbaaee5a204c611837b72a
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>