tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Skip emergency dialing VTS if device doesn't support radio" am: e0a858b1d5 am: d803e12ae5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I256e5d78235029420aea069858e184394ac550e6
This commit is contained in:
Shuo Qian 2021-01-08 20:51:53 +00:00 committed by Automerger Merge Worker
commit 72319e8de0
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
radio/1.0/vts/functional/vts_test_util.h
View file

@ -35,6 +35,8 @@ enum CheckFlag {
static constexpr const char* FEATURE_VOICE_CALL = "android.software.connectionservice"; static constexpr const char* FEATURE_VOICE_CALL = "android.software.connectionservice";
static constexpr const char* FEATURE_TELEPHONY = "android.hardware.telephony";
/* /*
* Generate random serial number for radio test * Generate random serial number for radio test
*/ */

9
radio/1.4/vts/functional/radio_hidl_hal_api.cpp
View file

@ -34,6 +34,9 @@ TEST_P(RadioHidlTest_v1_4, emergencyDial) {
if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) { if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {
ALOGI("Skipping emergencyDial because voice call is not supported in device"); ALOGI("Skipping emergencyDial because voice call is not supported in device");
return; return;
} else if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
ALOGI("Skipping emergencyDial because telephony radio is not supported in device");
return;
} else { } else {
ALOGI("Running emergencyDial because voice call is supported in device"); ALOGI("Running emergencyDial because voice call is supported in device");
} }
@ -86,6 +89,9 @@ TEST_P(RadioHidlTest_v1_4, emergencyDial_withServices) {
if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) { if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {
ALOGI("Skipping emergencyDial because voice call is not supported in device"); ALOGI("Skipping emergencyDial because voice call is not supported in device");
return; return;
} else if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
ALOGI("Skipping emergencyDial because telephony radio is not supported in device");
return;
} else { } else {
ALOGI("Running emergencyDial because voice call is supported in device"); ALOGI("Running emergencyDial because voice call is supported in device");
} }
@ -138,6 +144,9 @@ TEST_P(RadioHidlTest_v1_4, emergencyDial_withEmergencyRouting) {
if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) { if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {
ALOGI("Skipping emergencyDial because voice call is not supported in device"); ALOGI("Skipping emergencyDial because voice call is not supported in device");
return; return;
} else if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
ALOGI("Skipping emergencyDial because telephony radio is not supported in device");
return;
} else { } else {
ALOGI("Running emergencyDial because voice call is supported in device"); ALOGI("Running emergencyDial because voice call is supported in device");
} }