diff options
| author | Roshan Pius <rpius@google.com> | 2017-03-24 01:28:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-24 01:28:48 +0000 |
| commit | 14c5ecd85f3fd6a703a8bef710690246c8dd42bb (patch) | |
| tree | c810916760552ce653f9996f5cfc105f6b8fc8ff | |
| parent | f7d43430c2e579285b2dcf43f818ba8c3bde7144 (diff) | |
| parent | 2d5b09e28d584291f9f758acd8d5f9f07231a4da (diff) | |
| download | wpa_supplicant_8-android-o-preview-3.tar.gz | |
Merge "wpa_supplicant_hidl: Send the P2P device address"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4
am: 2d5b09e28d
Change-Id: I8d08b84d6a2cf45873d2b92c2e4b6858b05e4867
| -rw-r--r-- | wpa_supplicant/hidl/p2p_iface.cpp | 2 |
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( |