aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-05-24 14:20:54 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-05-24 14:20:54 +0000
commit8906d73d6fdc9927f7c06a5d286d4d1c277e8043 (patch)
tree4eed27d199bddb2c694809f67f146abbb399d325
parente0c72e882f67c7e1ba055f86447f34df9d068c17 (diff)
parent7a3998d9441af108e589afddd367762c4ef20f1b (diff)
downloadwpa_supplicant_8-8906d73d6fdc9927f7c06a5d286d4d1c277e8043.tar.gz
release-request-aaaef485-cf88-426c-8186-1f3903a60dd5-for-git_oc-release-4038872 snap-temp-L67700000067294126
Change-Id: I1898a6c045f6750548c21f812399048fdcb5c5d6
-rw-r--r--wpa_supplicant/hidl/1.0/p2p_iface.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/wpa_supplicant/hidl/1.0/p2p_iface.cpp b/wpa_supplicant/hidl/1.0/p2p_iface.cpp
index 9a048eb5..839fceee 100644
--- a/wpa_supplicant/hidl/1.0/p2p_iface.cpp
+++ b/wpa_supplicant/hidl/1.0/p2p_iface.cpp
@@ -2,6 +2,7 @@
* hidl interface for wpa_supplicant daemon
* Copyright (c) 2004-2016, Jouni Malinen <j@w1.fi>
* Copyright (c) 2004-2016, Roshan Pius <rpius@google.com>
+ * Copyright (C) 2017 Sony Mobile Communications Inc.
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@@ -14,6 +15,7 @@
#include "p2p_iface.h"
extern "C" {
+#include "ap.h"
#include "wps_supplicant.h"
#include "wifi_display.h"
}
@@ -1035,6 +1037,14 @@ SupplicantStatus P2pIface::startWpsPbcInternal(
}
const uint8_t* bssid_addr =
is_zero_ether_addr(bssid.data()) ? nullptr : bssid.data();
+#ifdef CONFIG_AP
+ if (wpa_group_s->ap_iface) {
+ if (wpa_supplicant_ap_wps_pbc(wpa_group_s, bssid_addr, NULL)) {
+ return {SupplicantStatusCode::FAILURE_UNKNOWN, ""};
+ }
+ return {SupplicantStatusCode::SUCCESS, ""};
+ }
+#endif /* CONFIG_AP */
if (wpas_wps_start_pbc(wpa_group_s, bssid_addr, 0)) {
return {SupplicantStatusCode::FAILURE_UNKNOWN, ""};
}