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

Commit 8721f36d authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Add Vts to enforce radioConfig is existed" into qt-dev 

am: 2317d2e9

Change-Id: I6e3a408b2fae54eb6d966000c3e6cfef79b09d5c
parents 7df7fc37 2317d2e9

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_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>