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

Commit 647d7a8a authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "wifi(vts): Add retry for HAL start" into oc-dev 

am: 4197ba02

Change-Id: I6552049f92cafa2544bd5d24e806f5dd45ea9627
parents da19736f 4197ba02

wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp

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



namespace {

constexpr uint32_t kHalStartRetryMaxCount = 5;

constexpr uint32_t kHalStartRetryIntervalInMs = 2;



bool findAnyModeSupportingIfaceType(

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

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

        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;

    }

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