commit 9f1118de2690245cdeeb016c13cb6d59ea887f92
author Ying Wang <wangying@google.com> Mon Nov 25 20:11:21 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 25 20:11:21 2013 +0000
tree c5eee7b69f8e6d67b0323322e012b2e8ae0f9a16
parent 38bb0ce24518c064f6df21f99fd14123159ed51f
parent 02552fd6e2a03970c014d71b3ca5f45caaa62327

Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"

wpa_supplicant/events.c

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 8359fc3..b9481f6 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -2132,11 +2132,7 @@
 			fast_reconnect_ssid = wpa_s->current_ssid;
 #endif /* CONFIG_NO_SCAN_PROCESSING */
 		} else if (wpa_s->wpa_state >= WPA_ASSOCIATING)
-#ifdef ANDROID
-			wpa_supplicant_req_scan(wpa_s, 0, 500000);
-#else
 			wpa_supplicant_req_scan(wpa_s, 0, 100000);
-#endif
 		else
 			wpa_dbg(wpa_s, MSG_DEBUG, "Do not request new "
 				"immediate scan");

wpa_supplicant/scan.c

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 6891083..625ff28 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -1199,9 +1199,6 @@
 	wpa_dbg(wpa_s, MSG_DEBUG, "Cancelling scan request");
 	eloop_cancel_timeout(wpa_supplicant_scan, wpa_s, NULL);
 	wpas_p2p_continue_after_scan(wpa_s);
-#ifdef ANDROID
-	wpa_supplicant_notify_scanning(wpa_s, 0);
-#endif
 }