Gate gsm/cdma radio feature only for emergency dial am: 80b03d7bf2 am: 2655aecb1a

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1546408

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52085b9412ecb66842163a4b2579a542b66da488
This commit is contained in:
Shuo Qian 2021-01-12 03:35:30 +00:00 committed by Automerger Merge Worker
commit a960203546
2 changed files with 13 additions and 6 deletions

View file

@ -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
*/

View file

@ -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");