From cbfd8e2d1098ecefd40c1fb7b53eaec53c8bfdc0 Mon Sep 17 00:00:00 2001 From: Aaron Tsai Date: Sun, 16 May 2021 17:25:26 +0800 Subject: [PATCH] Fix emergencyDial tests in VTS 1.6 - Change to calling getVoiceRegistrationState_1_6() instead of getVoiceRegistrationState(). - Fix incorrect voice registration state value Bug: 187488263 Test: atest VtsHalRadioV1_6TargetTest Change-Id: Iba5dcef20683bc6dca00b1c49899cfec5e1aac03 --- radio/1.6/vts/functional/radio_hidl_hal_api.cpp | 6 +++--- radio/1.6/vts/functional/radio_response.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp index 27e641ad96..422e91cf45 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp @@ -585,7 +585,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)) { @@ -639,7 +639,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)) { @@ -692,7 +692,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)) { diff --git a/radio/1.6/vts/functional/radio_response.cpp b/radio/1.6/vts/functional/radio_response.cpp index 6e7b86f5dd..b1e679b35b 100644 --- a/radio/1.6/vts/functional/radio_response.cpp +++ b/radio/1.6/vts/functional/radio_response.cpp @@ -1209,8 +1209,9 @@ Return RadioResponse_v1_6::getSystemSelectionChannelsResponse( Return 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(); }