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

Commit 7b66803f authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Added 1.4 setDataProfile and setInitialAttachApn" am: b6990823 am: 3ae436ce

am: 62f6566b

Change-Id: I023d45fb81ef3d7cbdacf53663751a1875377791
parents 498c5d31 62f6566b
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -522,8 +522,8 @@ TEST_F(RadioHidlTest_v1_4, setupDataCall_1_4) {
    memset(&dataProfileInfo, 0, sizeof(dataProfileInfo));
    dataProfileInfo.profileId = DataProfileId::DEFAULT;
    dataProfileInfo.apn = hidl_string("internet");
    dataProfileInfo.protocol = PdpProtocolType::IPV4V6;
    dataProfileInfo.roamingProtocol = PdpProtocolType::IPV4V6;
    dataProfileInfo.protocol = PdpProtocolType::IP;
    dataProfileInfo.roamingProtocol = PdpProtocolType::IP;
    dataProfileInfo.authType = ApnAuthType::NO_PAP_NO_CHAP;
    dataProfileInfo.user = hidl_string("username");
    dataProfileInfo.password = hidl_string("password");
+6 −2
Original line number Diff line number Diff line
@@ -533,7 +533,9 @@ Return<void> RadioResponse_v1_4::setCellInfoListRateResponse(const RadioResponse
    return Void();
}

Return<void> RadioResponse_v1_4::setInitialAttachApnResponse(const RadioResponseInfo& /*info*/) {
Return<void> RadioResponse_v1_4::setInitialAttachApnResponse(const RadioResponseInfo& info) {
    rspInfo = info;
    parent_v1_4.notify(info.serial);
    return Void();
}

@@ -604,7 +606,9 @@ Return<void> RadioResponse_v1_4::requestIccSimAuthenticationResponse(
    return Void();
}

Return<void> RadioResponse_v1_4::setDataProfileResponse(const RadioResponseInfo& /*info*/) {
Return<void> RadioResponse_v1_4::setDataProfileResponse(const RadioResponseInfo& info) {
    rspInfo = info;
    parent_v1_4.notify(info.serial);
    return Void();
}