Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 20:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix emergencyDial tests in VTS 1.6 am: cbfd8e2d10

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

Change-Id: I2b4cfdacc0f2a018873496b58d3bd45df48dfd4f
This commit is contained in:
Aaron Tsai
2021-05-19 03:10:52 +00:00
committed by Automerger Merge Worker
parent 151917bb54 cbfd8e2d10
commit db8b5cedf6
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
radio/1.6/vts/functional/radio_hidl_hal_api.cpp
View File

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

3
radio/1.6/vts/functional/radio_response.cpp
View File

@@ -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();
}