From 41a7f94f879aee66abd6ace5217c16012526ee8c Mon Sep 17 00:00:00 2001 From: Seongho Kim Date: Tue, 7 Dec 2021 04:19:58 +0000 Subject: [PATCH] Cherry pick "Gate gsm/cdma radio feature only for emergency dial" sc-v2-dev Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1908681 Bug: 207920538 Change-Id: I4eb369495d27e697679ecb3d4381f0b3e0cef758 Merged-In: I388bc51e58b5680b5b5c806d88a338822af0c8a7 --- radio/1.6/vts/functional/radio_hidl_hal_api.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp index 76bbebbfef..4549f51060 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp @@ -645,6 +645,10 @@ TEST_P(RadioHidlTest_v1_6, emergencyDial_1_6) { 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"); } @@ -699,6 +703,10 @@ TEST_P(RadioHidlTest_v1_6, emergencyDial_1_6_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"); } @@ -752,6 +760,10 @@ TEST_P(RadioHidlTest_v1_6, emergencyDial_1_6_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"); }