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

Commit 153558bd authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Telephony VTS: there's no CDMA-only devices anymore" into main

parents ebfb4c29 601c3e93

radio/aidl/vts/radio_aidl_hal_utils.h

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ static constexpr const char* FEATURE_VOICE_CALL = "android.software.connectionse 


static constexpr const char* FEATURE_TELEPHONY = "android.hardware.telephony";



static constexpr const char* FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";



static constexpr const char* FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";



static constexpr const char* FEATURE_TELEPHONY_IMS = "android.hardware.telephony.ims";

radio/aidl/vts/radio_modem_test.cpp

+0 −7
Original line number Diff line number Diff line
@@ -220,13 +220,6 @@ TEST_P(RadioModemTest, getDeviceIdentity) { 
 * Test IRadioModem.getImei() for the response returned.

 */

TEST_P(RadioModemTest, getImei) {

    if (telephony_flags::enforce_telephony_feature_mapping()) {

        if (!deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) {

            GTEST_SKIP() << "Skipping getImei "

                            "due to undefined FEATURE_TELEPHONY_GSM";

        }

    }



    int32_t aidl_version;

    ndk::ScopedAStatus aidl_status = radio_modem->getInterfaceVersion(&aidl_version);

    ASSERT_OK(aidl_status);

radio/aidl/vts/radio_network_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ TEST_P(RadioNetworkTest, startNetworkScan) { 
    if (cardStatus.cardState == CardStatus::STATE_ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::SIM_ABSENT}));

    } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) {

        if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM) && isLteConnected()) {

        if (isLteConnected()) {

            // Modems support 3GPP RAT family need to

            // support scanning requests combined with some parameters.

            ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,

radio/aidl/vts/radio_voice_test.cpp

+0 −12
Original line number Diff line number Diff line
@@ -102,10 +102,6 @@ TEST_P(RadioVoiceTest, emergencyDial) { 
        if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {

            ALOGI("Skipping emergencyDial because voice call is not supported in device");

            return;

        } else if (!deviceSupportsFeature(FEATURE_TELEPHONY_GSM) &&

                   !deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {

            ALOGI("Skipping emergencyDial because gsm/cdma radio is not supported in device");

            return;

        } else {

            ALOGI("Running emergencyDial because voice call is supported in device");

        }
@@ -163,10 +159,6 @@ TEST_P(RadioVoiceTest, emergencyDial_withServices) { 
        if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {

            ALOGI("Skipping emergencyDial because voice call is not supported in device");

            return;

        } else if (!deviceSupportsFeature(FEATURE_TELEPHONY_GSM) &&

                   !deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {

            ALOGI("Skipping emergencyDial because gsm/cdma radio is not supported in device");

            return;

        } else {

            ALOGI("Running emergencyDial because voice call is supported in device");

        }
@@ -224,10 +216,6 @@ TEST_P(RadioVoiceTest, emergencyDial_withEmergencyRouting) { 
        if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {

            ALOGI("Skipping emergencyDial because voice call is not supported in device");

            return;

        } else if (!deviceSupportsFeature(FEATURE_TELEPHONY_GSM) &&

                   !deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {

            ALOGI("Skipping emergencyDial because gsm/cdma radio is not supported in device");

            return;

        } else {

            ALOGI("Running emergencyDial because voice call is supported in device");

        }