Merge "Added 1.4 setDataProfile and setInitialAttachApn" am: b6990823f9

am: 3ae436ce52

Change-Id: I2facac8a7fec9631334a78173ab6e1b7e0950c85
This commit is contained in:
Jack Yu
2019-03-07 19:32:59 -08:00
committed by android-build-merger
2 changed files with 8 additions and 4 deletions

View File

@@ -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");

View File

@@ -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();
}