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

Commit 4952aeaa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix emergencyDial tests in VTS 1.6" into sc-dev am: d6f28cdf 

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

Change-Id: Ia0bf3f6b2d57f65b67800db742c05cd2cf9eb9b4
parents 06a26dc3 d6f28cdf

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+3 −3
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ TEST_P(RadioHidlTest_v1_6, emergencyDial_1_6) { 
    // or Emergency_Only.

    if (isDsDsEnabled() || isTsTsEnabled()) {

        serial = GetRandomSerialNumber();

        radio_v1_6->getVoiceRegistrationState(serial);

        radio_v1_6->getVoiceRegistrationState_1_6(serial);

        EXPECT_EQ(std::cv_status::no_timeout, wait());

        if (isVoiceEmergencyOnly(radioRsp_v1_6->voiceRegResp.regState) ||

            isVoiceInService(radioRsp_v1_6->voiceRegResp.regState)) {
@@ -653,7 +653,7 @@ TEST_P(RadioHidlTest_v1_6, emergencyDial_1_6_withServices) { 
    // or Emergency_Only.

    if (isDsDsEnabled() || isTsTsEnabled()) {

        serial = GetRandomSerialNumber();

        radio_v1_6->getVoiceRegistrationState(serial);

        radio_v1_6->getVoiceRegistrationState_1_6(serial);

        EXPECT_EQ(std::cv_status::no_timeout, wait());

        if (isVoiceEmergencyOnly(radioRsp_v1_6->voiceRegResp.regState) ||

            isVoiceInService(radioRsp_v1_6->voiceRegResp.regState)) {
@@ -706,7 +706,7 @@ TEST_P(RadioHidlTest_v1_6, emergencyDial_1_6_withEmergencyRouting) { 
    // or Emergency_Only.

    if (isDsDsEnabled() || isTsTsEnabled()) {

        serial = GetRandomSerialNumber();

        radio_v1_6->getVoiceRegistrationState(serial);

        radio_v1_6->getVoiceRegistrationState_1_6(serial);

        EXPECT_EQ(std::cv_status::no_timeout, wait());

        if (isVoiceEmergencyOnly(radioRsp_v1_6->voiceRegResp.regState) ||

            isVoiceInService(radioRsp_v1_6->voiceRegResp.regState)) {

radio/1.6/vts/functional/radio_response.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1209,8 +1209,9 @@ Return<void> RadioResponse_v1_6::getSystemSelectionChannelsResponse( 


Return<void> RadioResponse_v1_6::getVoiceRegistrationStateResponse_1_6(

        const ::android::hardware::radio::V1_6::RadioResponseInfo& info,

        const ::android::hardware::radio::V1_6::RegStateResult& /*regResponse*/) {

        const ::android::hardware::radio::V1_6::RegStateResult& regResponse) {

    rspInfo = info;

    voiceRegResp.regState = regResponse.regState;

    parent_v1_6.notify(info.serial);

    return Void();

}