Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cd75fca authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Add vts test for setCarrierInfoForImsiEncryption" into oc-dr1-dev 

am: e7acb1f8

Change-Id: I6ab82244f78f1b92938b8ab03eebfbd24514e6dd
parents 80d79761 e7acb1f8

radio/1.1/vts/functional/radio_hidl_hal_api.cpp

+23 −0
Original line number Diff line number Diff line
@@ -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);

    }

}
 
 No newline at end of file

radio/1.1/vts/functional/radio_response.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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();

}