diff --git a/radio/1.0/vts/functional/vts_test_util.h b/radio/1.0/vts/functional/vts_test_util.h index 846148fa08..218e8236b0 100644 --- a/radio/1.0/vts/functional/vts_test_util.h +++ b/radio/1.0/vts/functional/vts_test_util.h @@ -37,6 +37,10 @@ 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"; + /* * Generate random serial number for radio test */ diff --git a/radio/1.4/vts/functional/radio_hidl_hal_api.cpp b/radio/1.4/vts/functional/radio_hidl_hal_api.cpp index 4dcf1f3b9e..b0b984cf16 100644 --- a/radio/1.4/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.4/vts/functional/radio_hidl_hal_api.cpp @@ -34,8 +34,9 @@ TEST_P(RadioHidlTest_v1_4, emergencyDial) { if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) { ALOGI("Skipping emergencyDial because voice call is not supported in device"); return; - } else if (!deviceSupportsFeature(FEATURE_TELEPHONY)) { - ALOGI("Skipping emergencyDial because telephony radio is not supported in device"); + } 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"); @@ -89,8 +90,9 @@ TEST_P(RadioHidlTest_v1_4, emergencyDial_withServices) { if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) { ALOGI("Skipping emergencyDial because voice call is not supported in device"); return; - } else if (!deviceSupportsFeature(FEATURE_TELEPHONY)) { - ALOGI("Skipping emergencyDial because telephony radio is not supported in device"); + } 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"); @@ -144,8 +146,9 @@ TEST_P(RadioHidlTest_v1_4, emergencyDial_withEmergencyRouting) { if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) { ALOGI("Skipping emergencyDial because voice call is not supported in device"); return; - } else if (!deviceSupportsFeature(FEATURE_TELEPHONY)) { - ALOGI("Skipping emergencyDial because telephony radio is not supported in device"); + } 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");