Merge "Add vts test for setCarrierInfoForImsiEncryption"

This commit is contained in:
Shuo Qian
2017-08-03 23:08:14 +00:00
committed by Gerrit Code Review
2 changed files with 26 additions and 1 deletions

View File

@@ -107,3 +107,26 @@ TEST_F(RadioHidlTest_v1_1, stopNetworkScan) {
radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
}
}
/*
* Test IRadio.setCarrierInfoForImsiEncryption() for the response returned.
*/
TEST_F(RadioHidlTest_v1_1, setCarrierInfoForImsiEncryption) {
int serial = GetRandomSerialNumber();
ImsiEncryptionInfo imsiInfo;
imsiInfo.mcc = "310";
imsiInfo.mnc = "004";
imsiInfo.carrierKey = (std::vector<uint8_t>){1, 2, 3, 4, 5, 6};
imsiInfo.keyIdentifier = "Test";
imsiInfo.expirationTime = 20180101;
radio_v1_1->setCarrierInfoForImsiEncryption(serial, imsiInfo);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_1->rspInfo.type);
EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial);
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE ||
radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
}
}

View File

@@ -659,7 +659,9 @@ Return<void> RadioResponse_v1_1::acknowledgeRequest(int32_t /*serial*/) {
/* 1.1 Apis */
Return<void> RadioResponse_v1_1::setCarrierInfoForImsiEncryptionResponse(
const RadioResponseInfo& /*info*/) {
const RadioResponseInfo& info) {
rspInfo = info;
parent_v1_1.notify();
return Void();
}