commit 148905f7ac3ef429ccc4c632ed602972be17e2b2
author Jimmy Chen <jimmycmchen@google.com> Wed Oct 30 08:04:05 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 08:04:05 2019 -0700
tree 779152590bcd98059a6d3c1f1b55449d46611c03
parent 64c759c6ec83818e37a6547b19bb12107f0ef72f
parent 0d03c17ee5f547ecbb3654330bb37d12475194f7

p2p: handle terminated p2p interface during join scan
am: 0d03c17ee5

Change-Id: I0802fd2357eeee1866e9a69d4156557ead78448d

src/ap/acs.c

diff --git a/src/ap/acs.c b/src/ap/acs.c
index 3b45075..ca3b4e1 100644
--- a/src/ap/acs.c
+++ b/src/ap/acs.c
@@ -942,6 +942,12 @@
 	}
 	*freq = 0;
 
+	if (params.freqs == freq) {
+		wpa_printf(MSG_ERROR, "ACS: No available channels found");
+		os_free(params.freqs);
+		return -1;
+	}
+
 	iface->scan_cb = acs_scan_complete;
 
 	wpa_printf(MSG_DEBUG, "ACS: Scanning %d / %d",

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 8bcd7ef..b63ab39 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -95,7 +95,6 @@
 INCLUDES += $(LOCAL_PATH)/src/eapol_supp
 INCLUDES += $(LOCAL_PATH)/src/eap_peer
 INCLUDES += $(LOCAL_PATH)/src/eap_server
-INCLUDES += $(LOCAL_PATH)/src/hlr_auc_gw
 INCLUDES += $(LOCAL_PATH)/src/l2_packet
 INCLUDES += $(LOCAL_PATH)/src/radius
 INCLUDES += $(LOCAL_PATH)/src/rsn_supp