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

Commit 7a41d9d5 authored by Roshan Pius's avatar Roshan Pius
Browse files

wifi: Reset internal callback pointers on failure 

If these are not reset, any subsequent calls will not be processed
because the callback pointers are set.

Bug: 33379596
Test: Compiles
Change-Id: Ia44385fc185b7cf262366af7b0e0e62c32a0d9a0
parent d476754b

wifi/1.0/default/wifi_legacy_hal.cpp

+20 −11
Original line number Diff line number Diff line
@@ -571,12 +571,16 @@ wifi_error WifiLegacyHal::startRssiMonitoring( 
        std::copy(bssid_ptr, bssid_ptr + 6, std::begin(bssid_arr));

        on_threshold_breached_user_callback(id, bssid_arr, rssi);

      };

  return global_func_table_.wifi_start_rssi_monitoring(

      id,

  wifi_error status =

      global_func_table_.wifi_start_rssi_monitoring(id,

                                                    wlan_interface_handle_,

                                                    max_rssi,

                                                    min_rssi,

                                                    {onRssiThresholdBreached});

  if (status != WIFI_SUCCESS) {

    on_rssi_threshold_breached_internal_callback = nullptr;

  }

  return status;

}



wifi_error WifiLegacyHal::stopRssiMonitoring(wifi_request_id id) {
@@ -751,11 +755,16 @@ wifi_error WifiLegacyHal::startRttRangeRequest( 
  };



  std::vector<wifi_rtt_config> rtt_configs_internal(rtt_configs);

  return global_func_table_.wifi_rtt_range_request(id,

  wifi_error status =

      global_func_table_.wifi_rtt_range_request(id,

                                                wlan_interface_handle_,

                                                rtt_configs.size(),

                                                rtt_configs_internal.data(),

                                                {onRttResults});

  if (status != WIFI_SUCCESS) {

    on_rtt_results_internal_callback = nullptr;

  }

  return status;

}



wifi_error WifiLegacyHal::cancelRttRangeRequest(