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

Commit 887e55a0 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Revert "Handle radio API in low version VTS for high version service""... 

Merge "Revert "Handle radio API in low version VTS for high version service"" into pi-dev am: 01e286d5
am: 7372a973

Change-Id: Id96d88efa65e5e824af88ffdee6b203f166e9430
parents 1ac7867e 7372a973

radio/1.0/vts/functional/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ cc_test { 
           "VtsHalRadioV1_0TargetTest.cpp",

           "vts_test_util.cpp"],

    static_libs: [

        "android.hardware.radio@1.2",

        "android.hardware.radio@1.1",

        "android.hardware.radio@1.0",

    ],

}
@@ -46,8 +44,6 @@ cc_test { 
           "VtsHalSapV1_0TargetTest.cpp",

           "vts_test_util.cpp"],

    static_libs: [

        "android.hardware.radio@1.2",

        "android.hardware.radio@1.1",

        "android.hardware.radio@1.0",

    ],

}
@@ -59,8 +55,6 @@ cc_library_static { 
        "vts_test_util.cpp"

    ],

    shared_libs: [

        "android.hardware.radio@1.2",

        "android.hardware.radio@1.1",

        "android.hardware.radio@1.0",

    ],

}

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+9 −13
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ TEST_F(RadioHidlTest, getSignalStrength) { 
 * Test IRadio.getVoiceRegistrationState() for the response returned.

 */

TEST_F(RadioHidlTest, getVoiceRegistrationState) {

    // The IRadio/IRadioResponse pair of this function is upgraded in 1.2.

    // For radio version < 1.2, skip to test this function.

    if (versionIRadio < v1_2) {

    serial = GetRandomSerialNumber();



    radio->getVoiceRegistrationState(serial);
@@ -50,7 +47,6 @@ TEST_F(RadioHidlTest, getVoiceRegistrationState) { 
        EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);

    }

}

}



/*

 * Test IRadio.getOperator() for the response returned.

radio/1.0/vts/functional/radio_hidl_hal_test.cpp

+0 −4
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ void RadioHidlTest::SetUp() { 
            RadioHidlEnvironment::Instance()->getServiceName<IRadio>(

                hidl_string(RADIO_SERVICE_NAME)));

    }



    versionIRadio = getIRadioVersion(radio);

    ASSERT_FALSE(unknown == versionIRadio);



    ASSERT_NE(nullptr, radio.get());



    radioRsp = new (std::nothrow) RadioResponse(*this);

radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h

+0 −4
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ using namespace ::android::hardware::radio::V1_0; 


using ::android::hardware::hidl_string;

using ::android::hardware::hidl_vec;

using ::android::hardware::hidl_version;

using ::android::hardware::Return;

using ::android::hardware::Void;

using ::android::sp;
@@ -537,9 +536,6 @@ class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
    /* Serial number for radio request */

    int serial;



    /* Version of radio service */

    hidl_version versionIRadio{0, 0};



    /* Update Sim Card Status */

    void updateSimCardStatus();

radio/1.0/vts/functional/vts_test_util.cpp

+0 −18
Original line number Diff line number Diff line
@@ -54,21 +54,3 @@ int GetRandomSerialNumber() { 
    }

    return testing::AssertionFailure() << "SapError:" + toString(err) + " is returned";

}
 


hidl_version getIRadioVersion(sp<::android::hardware::radio::V1_0::IRadio> radio) {

    if (::android::hardware::radio::V1_2::IRadio::castFrom(radio).withDefault(nullptr) != nullptr) {

        ALOGI("Radio service version: 1.2");

        return v1_2;

    } else if (::android::hardware::radio::V1_1::IRadio::castFrom(radio).withDefault(nullptr) !=

               nullptr) {

        ALOGI("Radio service version: 1.1");

        return v1_1;

    } else if (::android::hardware::radio::V1_0::IRadio::castFrom(radio).withDefault(nullptr) !=

               nullptr) {

        ALOGI("Radio service version: 1.0");

        return v1_0;

    } else {

        ALOGI("Radio service version: unknown");

        return unknown;

    }

}
 
 No newline at end of file