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

Commit e0a858b1 authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Skip emergency dialing VTS if device doesn't support radio"

parents e21ce63b 628a3353

radio/1.0/vts/functional/vts_test_util.h

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

 */

 */

radio/1.4/vts/functional/radio_hidl_hal_api.cpp

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

    }

    }