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

Commit 03e3b621 authored by Ahmed ElArabawy's avatar Ahmed ElArabawy Committed by Android (Google) Code Review
Browse files

Merge "Wifi: Fix VTS test backward compatibility"

parents 7436ee15 aa1e6b02

wifi/1.0/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ cc_test { 
    static_libs: [

        "VtsHalWifiV1_0TargetTestUtil",

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "android.hardware.wifi@1.2",

        "android.hardware.wifi@1.3",

    ],

wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp

+14 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <android-base/logging.h>



#include <android/hardware/wifi/1.0/IWifiChip.h>

#include <android/hardware/wifi/1.3/IWifiChip.h>



#include <VtsHalHidlTargetTestBase.h>
@@ -87,7 +88,19 @@ class WifiChipHidlTest : public ::testing::VtsHalHidlTargetTestBase { 


    uint32_t configureChipForStaIfaceAndGetCapabilities() {

        configureChipForIfaceType(IfaceType::STA, true);

        const auto& status_and_caps = HIDL_INVOKE(wifi_chip_, getCapabilities);



        sp<::android::hardware::wifi::V1_3::IWifiChip> chip_converted =

            ::android::hardware::wifi::V1_3::IWifiChip::castFrom(wifi_chip_);



        std::pair<WifiStatus, uint32_t> status_and_caps;



        if (chip_converted != nullptr) {

            // Call the newer HAL version

            status_and_caps = HIDL_INVOKE(chip_converted, getCapabilities_1_3);

        } else {

            status_and_caps = HIDL_INVOKE(wifi_chip_, getCapabilities);

        }



        if (status_and_caps.first.code != WifiStatusCode::SUCCESS) {

            EXPECT_EQ(WifiStatusCode::ERROR_NOT_SUPPORTED, status_and_caps.first.code);

            return 0;

wifi/1.1/vts/functional/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ cc_test { 
        "VtsHalWifiV1_0TargetTestUtil",

        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "android.hardware.wifi@1.2",

        "android.hardware.wifi@1.3",

    ],

    test_suites: ["general-tests"],

}

wifi/1.1/vts/functional/wifi_chip_hidl_test.cpp

+14 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <android/hardware/wifi/1.1/IWifi.h>

#include <android/hardware/wifi/1.1/IWifiChip.h>

#include <android/hardware/wifi/1.3/IWifiChip.h>



#include <VtsHalHidlTargetTestBase.h>
@@ -58,7 +59,19 @@ class WifiChipHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        ChipModeId mode_id;

        EXPECT_TRUE(configureChipToSupportIfaceType(

            wifi_chip_, IfaceType::STA, &mode_id));

        const auto& status_and_caps = HIDL_INVOKE(wifi_chip_, getCapabilities);



        sp<::android::hardware::wifi::V1_3::IWifiChip> chip_converted =

            ::android::hardware::wifi::V1_3::IWifiChip::castFrom(wifi_chip_);



        std::pair<WifiStatus, uint32_t> status_and_caps;



        if (chip_converted != nullptr) {

            // Call the newer HAL version

            status_and_caps = HIDL_INVOKE(chip_converted, getCapabilities_1_3);

        } else {

            status_and_caps = HIDL_INVOKE(wifi_chip_, getCapabilities);

        }



        EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_caps.first.code);

        return status_and_caps.second;

    }

wifi/1.2/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ cc_test { 
        "android.hardware.wifi@1.0",

        "android.hardware.wifi@1.1",

        "android.hardware.wifi@1.2",

        "android.hardware.wifi@1.3",

    ],

    test_suites: ["general-tests"],

}