aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2017-03-24 01:30:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-24 01:30:48 +0000
commit1fb3e1c06e0b8eebd310991a34bc4fd454133834 (patch)
treec810916760552ce653f9996f5cfc105f6b8fc8ff
parentf0cf57cb25f1ecd9ee9cba5da267300e48ecc459 (diff)
parent14c5ecd85f3fd6a703a8bef710690246c8dd42bb (diff)
downloadwpa_supplicant_8-1fb3e1c06e0b8eebd310991a34bc4fd454133834.tar.gz
Merge "wpa_supplicant_hidl: Send the P2P device address" am: 2d5b09e28d
am: 14c5ecd85f Change-Id: I7e6326db2a5f3ad779ad087922e08d739c58e9a7
-rw-r--r--wpa_supplicant/hidl/p2p_iface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/wpa_supplicant/hidl/p2p_iface.cpp b/wpa_supplicant/hidl/p2p_iface.cpp
index 50e1a336..195c6b95 100644
--- a/wpa_supplicant/hidl/p2p_iface.cpp
+++ b/wpa_supplicant/hidl/p2p_iface.cpp
@@ -592,7 +592,7 @@ P2pIface::getDeviceAddressInternal()
std::array<uint8_t, 6> addr;
static_assert(ETH_ALEN == addr.size(), "Size mismatch");
os_memcpy(addr.data(), wpa_s->global->p2p_dev_addr, ETH_ALEN);
- return {{SupplicantStatusCode::SUCCESS, ""}, {}};
+ return {{SupplicantStatusCode::SUCCESS, ""}, addr};
}
SupplicantStatus P2pIface::setSsidPostfixInternal(