From bbeed1c6fc325b8d238b89ae6c37de4ce410dd09 Mon Sep 17 00:00:00 2001 From: Shuo Qian Date: Mon, 11 Jan 2021 11:38:15 -0800 Subject: [PATCH] Gate gsm/cdma radio feature only for emergency dial Test: vts Bug: 176862267 Change-Id: I73a6920a94f2f703dc6ae19ad9a511673c9d035d Merged-In: I73a6920a94f2f703dc6ae19ad9a511673c9d035d --- radio/1.0/vts/functional/vts_test_util.h | 4 ++++ 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");