This is rebased version of this AOSP commit:
commit
20df807cb700c516ff346732f1bc8f914d0d26d8
Author: Dmitry Shmidt <dimitrysh@google.com>
Date: Fri Apr 8 15:35:17 2011 -0700
Fix scan notification in case of canceling scan
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
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
}