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

Commit 29090fb9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix setCarrierInfoForImsiEncryption in VTS 1.6" am: 4c912d90 am: 2d962bae am: 6932319f 

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

Change-Id: I41fd49fcf921201efc588edb435f46fbc28b52ad
parents 48ffded2 6932319f

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+2 −2
Original line number Diff line number Diff line
@@ -733,8 +733,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(

radio/1.6/vts/functional/radio_response.cpp

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

}