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

Merge "Fix setCarrierInfoForImsiEncryption in VTS 1.6" am: 4c912d9042 am: 2d962bae92

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

Change-Id: I92bd974cdaee83810928d1e5bea0c36ed1c13b4a
This commit is contained in:
Treehugger Robot
2021-03-25 08:42:29 +00:00
committed by Automerger Merge Worker
parent 8cd3c855c3 2d962bae92
commit 6932319f1f
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -727,8 +727,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(

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

@@ -751,7 +751,9 @@ Return<void> RadioResponse_v1_6::acknowledgeRequest(int32_t /*serial*/) {
/* 1.1 Apis */
Return<void> 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();
}