From f1762ea817edbb3c78ded5320bfd165938448185 Mon Sep 17 00:00:00 2001 From: Aaron Tsai Date: Sat, 20 Mar 2021 02:32:43 +0800 Subject: [PATCH] Fix setCarrierInfoForImsiEncryption in VTS 1.6 Bug: 181635271 Test: atest VtsHalRadioV1_6TargetTest Change-Id: I1297962c21e3e7f82cbe9bc9e28438f1fb9c8457 --- radio/1.6/vts/functional/radio_hidl_hal_api.cpp | 4 ++-- radio/1.6/vts/functional/radio_response.cpp | 4 +++- 2 files changed, 5 insertions(+), 3 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 91d98cbce1..589cd7b904 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp @@ -706,8 +706,8 @@ TEST_P(RadioHidlTest_v1_6, setCarrierInfoForImsiEncryption_1_6) { radio_v1_6->setCarrierInfoForImsiEncryption_1_6(serial, imsiInfo); EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type); - EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo_v1_0.type); + EXPECT_EQ(serial, radioRsp_v1_6->rspInfo_v1_0.serial); if (cardStatus.base.base.base.cardState == CardState::ABSENT) { ASSERT_TRUE(CheckAnyOfErrors( diff --git a/radio/1.6/vts/functional/radio_response.cpp b/radio/1.6/vts/functional/radio_response.cpp index d0c2984d13..e476d060cf 100644 --- a/radio/1.6/vts/functional/radio_response.cpp +++ b/radio/1.6/vts/functional/radio_response.cpp @@ -749,7 +749,9 @@ Return RadioResponse_v1_6::acknowledgeRequest(int32_t /*serial*/) { /* 1.1 Apis */ Return RadioResponse_v1_6::setCarrierInfoForImsiEncryptionResponse( - const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& info) { + rspInfo_v1_0 = info; + parent_v1_6.notify(info.serial); return Void(); }