commit b23256c01d3cf53d3413d606e654b0a565f4a891
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 11 06:42:18 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 11 06:42:18 2019 +0000
tree 161487d7f3dff62321ffc14a2aa6d644e6dab7b5
parent 2bc3a2a7d9b8b34b796e5e2afdecb22e6c5e7ac0
parent eee89435cb5f722da6a4298d9fa19144f5bcdf10

p2p: early return if p2p interface is not available yet. am: eee89435cb

Change-Id: If789ef329f8d3405766c7d286dfc4d45939ca74c

wpa_supplicant/hidl/1.2/p2p_iface.cpp

diff --git a/wpa_supplicant/hidl/1.2/p2p_iface.cpp b/wpa_supplicant/hidl/1.2/p2p_iface.cpp
index 4df65aa..0a6b657 100644
--- a/wpa_supplicant/hidl/1.2/p2p_iface.cpp
+++ b/wpa_supplicant/hidl/1.2/p2p_iface.cpp
@@ -1634,6 +1634,10 @@
 	int vht = wpa_s->conf->p2p_go_vht;
 	int ht40 = wpa_s->conf->p2p_go_ht40 || vht;
 
+	if (wpa_s->global->p2p == NULL) {
+		return {SupplicantStatusCode::FAILURE_IFACE_DISABLED, ""};
+	}
+
 	if (!isSsidValid(ssid)) {
 		return {SupplicantStatusCode::FAILURE_ARGS_INVALID, "SSID is invalid."};
 	}
@@ -1643,10 +1647,6 @@
 	}
 
 	if (!joinExistingGroup) {
-		if (wpa_s->global->p2p == NULL) {
-			return {SupplicantStatusCode::FAILURE_IFACE_DISABLED, ""};
-		}
-
 		struct p2p_data *p2p = wpa_s->global->p2p;
 		os_memcpy(p2p->ssid, ssid.data(), ssid.size());
 		p2p->ssid_len = ssid.size();