Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcc5f633 authored by Les Lee's avatar Les Lee Committed by Android (Google) Code Review
Browse files

Merge "wifi: Extend onFailure callback for dual AP case"

parents 5b2858b7 6645e9ea

wifi/hostapd/aidl/aidl_api/android.hardware.wifi.hostapd/current/android/hardware/wifi/hostapd/IHostapdCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -36,5 +36,5 @@ package android.hardware.wifi.hostapd; 
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);

}

wifi/hostapd/aidl/android/hardware/wifi/hostapd/IHostapdCallback.aidl

+5 −2
Original line number Diff line number Diff line
@@ -41,7 +41,10 @@ interface IHostapdCallback { 
     * 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);

}

wifi/hostapd/aidl/vts/functional/VtsHalHostapdTargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ class HostapdCallback : public BnHostapdCallback { 
        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();

    }

};