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 daceadec9ecc9ee0a9d2aa113f8e670ec9dac951..8c29b2010ad59a8abfb7724236060acf1440b524 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1787,8 +1787,12 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
                                wpa_s->current_bss = bss;
                }
 
+#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");