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

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09e1ac10aa707fb52ba5d1bc66e4aafe42a2b764
parents 75a296e8 e0a858b1

radio/1.0/vts/functional/vts_test_util.h

+2 −0
Original line number 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_TELEPHONY = "android.hardware.telephony";



/*

 * Generate random serial number for radio test

 */

radio/1.4/vts/functional/radio_hidl_hal_api.cpp

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

        return;

    } else {

        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)) {

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

        return;

    } else {

        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)) {

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

        return;

    } else {

        ALOGI("Running emergencyDial because voice call is supported in device");

    }