Allow immediate scan request even if another scan was scheduled later

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

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index c526e46a4b4bce231256e4af64abf233b6279a3f..e953c851ef8ef137cca028ed7025e961729723bb 100644 (file)
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -901,6 +901,7 @@ void wpa_supplicant_update_scan_int(struct wpa_supplicant *wpa_s, int sec)
  */
 void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec)
 {
+#ifndef ANDROID
        /* If there's at least one network that should be specifically scanned
         * then don't cancel the scan and reschedule.  Some drivers do
         * background scanning which generates frequent scan results, and that
@@ -923,7 +924,7 @@ void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec)
                        return;
                }
        }
-
+#endif
        wpa_dbg(wpa_s, MSG_DEBUG, "Setting scan request: %d sec %d usec",
                sec, usec);
        eloop_cancel_timeout(wpa_supplicant_scan, wpa_s, NULL);