Merge "Fix setCarrierInfoForImsiEncryption in VTS 1.6"
This commit is contained in:
commit
4c912d9042
2 changed files with 5 additions and 3 deletions
|
@ -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(
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue