Revert "Add update of mac address to supplicant"
This reverts commit aff9a6adf7957cb1698af1a22f2395b94ea294dc.
Reason for revert: Adding new implementation to update mac address
through ag/12687361
Bug:149448388
Test: Manual - Connect - Disconnect multiple times.
Change-Id: I7936131494f336c0f640b25ff4cf5b68f4f398c6
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index b440497..5cc9c65 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -16,10 +16,6 @@
CONFIG_DRIVER_NL80211_QCA=y
endif
-ifeq ($(WIFI_UPDATE_SUPPLICANT_MAC_ADDR), enabled)
- FEATURE_UPDATE_STA_MAC_ADDR=y
-endif
-
include $(LOCAL_PATH)/android.config
# To ignore possible wrong network configurations
diff --git a/wpa_supplicant/hidl/1.4/sta_network.cpp b/wpa_supplicant/hidl/1.4/sta_network.cpp
index 35524f7..a87c9eb 100644
--- a/wpa_supplicant/hidl/1.4/sta_network.cpp
+++ b/wpa_supplicant/hidl/1.4/sta_network.cpp
@@ -1927,11 +1927,6 @@
struct wpa_supplicant *wpa_s = retrieveIfacePtr();
wpa_s->scan_min_time.sec = 0;
wpa_s->scan_min_time.usec = 0;
-#ifdef FEATURE_UPDATE_STA_MAC_ADDR
- // Make sure that the supplicant is updated to the latest
- // MAC address, which might have changed due to MAC randomization.
- wpa_supplicant_update_mac_addr(wpa_s);
-#endif
wpa_supplicant_select_network(wpa_s, wpa_ssid);
return {SupplicantStatusCode::SUCCESS, ""};
}