Update AP IE regardless WPA_DRIVER_FLAGS_BSS_SELECTION flag

Change-Id: Ia2b0aea81e250cfd989861ed37551ca8c41f7a66
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 6761c1a8b7d1f7a885c156775018d86a40a37ba3..2a1ffac8c097fef165cbf174e85c3ee2e4ed6d77 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1894,8 +1894,12 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
                        return;
                }
 
+#ifdef ANDROID
+               if (wpa_s->conf->ap_scan == 1) {
+#else
                if (wpa_s->conf->ap_scan == 1 &&
                    wpa_s->drv_flags & WPA_DRIVER_FLAGS_BSS_SELECTION) {
+#endif
                        if (wpa_supplicant_assoc_update_ie(wpa_s) < 0)
                                wpa_msg(wpa_s, MSG_WARNING,
                                        "WPA/RSN IEs not updated");