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

Commit c802e093 authored by Roshan Pius's avatar Roshan Pius
Browse files

wifi(vts): Add retry for HAL start 

Port of the retry logic added in HalDeviceManager for temporary IWifi.start()
failures when invoked immediately after IWifi.stop().

Bug: 38342536
Test: Run VTS tests
Change-Id: Ie58a08c45979bafa0c61fa1c8536a2c0a0cd8ed9
parent 76cfb841

wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp

+12 −1
Original line number Original line Diff line number Diff line
@@ -36,6 +36,9 @@ using ::android::hardware::hidl_string; 
using ::android::hardware::hidl_vec;

using ::android::hardware::hidl_vec;





namespace {

namespace {

constexpr uint32_t kHalStartRetryMaxCount = 5;

constexpr uint32_t kHalStartRetryIntervalInMs = 2;



bool findAnyModeSupportingIfaceType(

bool findAnyModeSupportingIfaceType(

    IfaceType desired_type, const std::vector<IWifiChip::ChipMode>& modes,

    IfaceType desired_type, const std::vector<IWifiChip::ChipMode>& modes,

    ChipModeId* mode_id) {

    ChipModeId* mode_id) {
@@ -92,7 +95,15 @@ sp<IWifiChip> getWifiChip() { 
    if (!wifi.get()) {

    if (!wifi.get()) {

        return nullptr;

        return nullptr;

    }

    }

    if (HIDL_INVOKE(wifi, start).code != WifiStatusCode::SUCCESS) {

    uint32_t retry_count = 0;

    auto status = HIDL_INVOKE(wifi, start);

    while (retry_count < kHalStartRetryMaxCount &&

           status.code == WifiStatusCode::ERROR_NOT_AVAILABLE) {

        retry_count++;

        usleep(kHalStartRetryIntervalInMs * 1000);

        status = HIDL_INVOKE(wifi, start);

    }

    if (status.code != WifiStatusCode::SUCCESS) {

        return nullptr;

        return nullptr;

    }

    }

    const auto& status_and_chip_ids = HIDL_INVOKE(wifi, getChipIds);

    const auto& status_and_chip_ids = HIDL_INVOKE(wifi, getChipIds);