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

Commit 5564a15f authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Merge "Revert "Change ifname to interface handle in set_scan_mode api"" into main

parents a2ef5247 3a4e5591

wifi/aidl/default/wifi_legacy_hal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2012,7 +2012,7 @@ wifi_error WifiLegacyHal::twtClearStats(const std::string& iface_name, uint8_t c 
}



wifi_error WifiLegacyHal::setScanMode(const std::string& iface_name, bool enable) {

    return global_func_table_.wifi_set_scan_mode(getIfaceHandle(iface_name), enable);

    return global_func_table_.wifi_set_scan_mode(iface_name.c_str(), enable);

}



wifi_error WifiLegacyHal::setDtimConfig(const std::string& iface_name, uint32_t multiplier) {

wifi/legacy_headers/include/hardware_legacy/wifi_hal.h

+1 −1
Original line number Diff line number Diff line
@@ -1386,7 +1386,7 @@ typedef struct { 
     * @param enable true if current is scan only mode

     * @return Synchronous wifi_error

     */

    wifi_error (*wifi_set_scan_mode)(wifi_interface_handle iface, bool enable);

    wifi_error (*wifi_set_scan_mode)(const char * ifname, bool enable);



    wifi_error (*wifi_nan_pairing_end)(transaction_id id,

                                    wifi_interface_handle iface,