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

Commit a269b9b2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5606075 from 2406d887 to qt-c2f2-release 

Change-Id: I704db36854fd74e307bb2e7ef1331d2b723e855e
parents 9477125f 2406d887

radio/1.4/vts/functional/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ cc_test { 
        "android.hardware.radio@1.2",

        "android.hardware.radio@1.1",

        "android.hardware.radio@1.0",

        "android.hardware.radio.config@1.0",

        "android.hardware.radio.config@1.1",

    ],

    header_libs: ["radio.util.header@1.0"],

    test_suites: ["general-tests"]

radio/1.4/vts/functional/radio_hidl_hal_api.cpp

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ TEST_F(RadioHidlTest_v1_4, setPreferredNetworkTypeBitmap) { 


    network_type_bitmap |= ::android::hardware::radio::V1_4::RadioAccessFamily::LTE;



    // TODO(b/131634656): LTE_CA will be sent to modem as a RAF in Q, but LTE_CA is not a RAF,

    // we will not send it to modem as a RAF in R.

    network_type_bitmap |= ::android::hardware::radio::V1_4::RadioAccessFamily::LTE_CA;



    Return<void> res = radio_v1_4->setPreferredNetworkTypeBitmap(serial, network_type_bitmap);



    ASSERT_OK(res);

radio/1.4/vts/functional/radio_hidl_hal_test.cpp

+8 −1
Original line number Diff line number Diff line
@@ -47,6 +47,13 @@ void RadioHidlTest_v1_4::SetUp() { 
    EXPECT_EQ(serial, radioRsp_v1_4->rspInfo.serial);

    EXPECT_EQ(RadioError::NONE, radioRsp_v1_4->rspInfo.error);



    sp<::android::hardware::radio::config::V1_1::IRadioConfig> radioConfig =

            ::testing::VtsHalHidlTargetTestBase::getService<

                    ::android::hardware::radio::config::V1_1::IRadioConfig>();



    /* Enforce Vts tesing with RadioConfig is existed. */

    ASSERT_NE(nullptr, radioConfig.get());



    /* Enforce Vts Testing with Sim Status Present only. */

    EXPECT_EQ(CardState::PRESENT, cardStatus.base.base.cardState);

}

radio/1.4/vts/functional/radio_hidl_hal_utils_v1_4.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <condition_variable>

#include <mutex>



#include <android/hardware/radio/config/1.1/IRadioConfig.h>



#include <android/hardware/radio/1.4/IRadio.h>

#include <android/hardware/radio/1.4/IRadioIndication.h>

#include <android/hardware/radio/1.4/IRadioResponse.h>

wifi/1.3/default/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -142,12 +142,14 @@ LOCAL_CPPFLAGS := -Wall -Werror -Wextra 
LOCAL_SRC_FILES := \

    tests/hidl_struct_util_unit_tests.cpp \

    tests/main.cpp \

    tests/mock_interface_tool.cpp \

    tests/mock_wifi_feature_flags.cpp \

    tests/mock_wifi_iface_util.cpp \

    tests/mock_wifi_legacy_hal.cpp \

    tests/mock_wifi_mode_controller.cpp \

    tests/ringbuffer_unit_tests.cpp \

    tests/wifi_ap_iface_unit_tests.cpp \

    tests/wifi_nan_iface_unit_tests.cpp \

    tests/wifi_chip_unit_tests.cpp \

    tests/wifi_iface_util_unit_tests.cpp

LOCAL_STATIC_LIBRARIES := \