| commit | fcc5f633a90152595e28028152ef73eca0c41859 | [log] [tgz] |
|---|---|---|
| author | Les Lee <lesl@google.com> | Thu Dec 23 00:16:30 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 23 00:16:30 2021 +0000 |
| tree | 921990e2c2c5e91f80bc0819c2d5ad92f1d7fa52 | |
| parent | 5b2858b70998175910184b54e98532879dc86006 [diff] | |
| parent | 6645e9ea7183cd513599dfd8b01b597f2e83f1bc [diff] |
Merge "wifi: Extend onFailure callback for dual AP case"
diff --git a/wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/IHostapdCallback.aidl b/wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/IHostapdCallback.aidl index 36d2104..9dd062a 100644 --- a/wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/IHostapdCallback.aidl +++ b/wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/IHostapdCallback.aidl
@@ -36,5 +36,5 @@ interface IHostapdCallback { oneway void onApInstanceInfoChanged(in android.hardware.wifi.hostapd.ApInfo apInfo); oneway void onConnectedClientsChanged(in android.hardware.wifi.hostapd.ClientInfo clientInfo); - oneway void onFailure(in String ifaceName); + oneway void onFailure(in String ifaceName, in String instanceName); }
diff --git a/wifi/hostapd/aidl/android/hardware/wifi/hostapd/IHostapdCallback.aidl b/wifi/hostapd/aidl/android/hardware/wifi/hostapd/IHostapdCallback.aidl index 7b04944..456f46a 100644 --- a/wifi/hostapd/aidl/android/hardware/wifi/hostapd/IHostapdCallback.aidl +++ b/wifi/hostapd/aidl/android/hardware/wifi/hostapd/IHostapdCallback.aidl
@@ -41,7 +41,10 @@ * Invoked when an asynchronous failure is encountered in one of the access * points added via |IHostapd.addAccessPoint|. * - * @param ifaceName Name of the interface. + * @param ifaceName Name of the interface which was added via + * |IHostapd.addAccessPoint|. + * @param instanceName Name of the AP instance which is associated with + * the interface. */ - oneway void onFailure(in String ifaceName); + oneway void onFailure(in String ifaceName, in String instanceName); }
diff --git a/wifi/hostapd/aidl/vts/functional/VtsHalHostapdTargetTest.cpp b/wifi/hostapd/aidl/vts/functional/VtsHalHostapdTargetTest.cpp index 41c54b3..dad7085 100644 --- a/wifi/hostapd/aidl/vts/functional/VtsHalHostapdTargetTest.cpp +++ b/wifi/hostapd/aidl/vts/functional/VtsHalHostapdTargetTest.cpp
@@ -232,7 +232,7 @@ const ::aidl::android::hardware::wifi::hostapd::ClientInfo &) override { return ndk::ScopedAStatus::ok(); } - ::ndk::ScopedAStatus onFailure(const std::string &) override { + ::ndk::ScopedAStatus onFailure(const std::string&, const std::string&) override { return ndk::ScopedAStatus::ok(); } };