Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9602035 authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Gate gsm/cdma radio feature only for emergency dial am: 80b03d7b am: 2655aecb 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52085b9412ecb66842163a4b2579a542b66da488
parents b29a5a3b 2655aecb

radio/1.0/vts/functional/vts_test_util.h

+4 −0
Original line number Diff line number Diff line
@@ -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

 */

radio/1.4/vts/functional/radio_hidl_hal_api.cpp

+9 −6
Original line number Diff line number Diff line
@@ -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");