diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-01-13 21:03:21 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-01-13 21:03:21 +0000 |
| commit | 2d6bfdd13c4763333d3f75042c9674278523e792 (patch) | |
| tree | 0b6830cf9418d0611ae2905f3539adfa86bbe1a8 | |
| parent | d40813301f12399548cca63c924ddf1cab1c4bcd (diff) | |
| parent | bbeed1c6fc325b8d238b89ae6c37de4ce410dd09 (diff) | |
| download | platform_hardware_interfaces-2d6bfdd13c4763333d3f75042c9674278523e792.tar.gz platform_hardware_interfaces-2d6bfdd13c4763333d3f75042c9674278523e792.tar.bz2 platform_hardware_interfaces-2d6bfdd13c4763333d3f75042c9674278523e792.zip | |
Snap for 7078141 from bbeed1c6fc325b8d238b89ae6c37de4ce410dd09 to android10-tests-releaseandroid-cts-10.0_r7
Change-Id: Ic9ce0ae09b47810769d447d02e8885e27d431e9d
| -rw-r--r-- | radio/1.0/vts/functional/vts_test_util.h | 4 | ||||
| -rw-r--r-- | radio/1.4/vts/functional/radio_hidl_hal_api.cpp | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/radio/1.0/vts/functional/vts_test_util.h b/radio/1.0/vts/functional/vts_test_util.h index 3decd8dbb1..d01f2329e0 100644 --- a/radio/1.0/vts/functional/vts_test_util.h +++ b/radio/1.0/vts/functional/vts_test_util.h @@ -38,6 +38,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 5f9191485b..c4295bc654 100644 --- a/radio/1.4/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.4/vts/functional/radio_hidl_hal_api.cpp @@ -25,8 +25,9 @@ TEST_F(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"); @@ -66,8 +67,9 @@ TEST_F(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"); @@ -108,8 +110,9 @@ TEST_F(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"); |