From f666f424156b723e1f94f1aa68839493323aa9bd Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Wed, 6 Mar 2019 14:57:41 -0800 Subject: [PATCH] Added 1.4 setDataProfile and setInitialAttachApn Added cuttlefish support for setDataProfile and setInitialAttachApn v1.4 support Test: vts-tradefed run vts -m VtsHalRadioV1_4Target Bug: 121345833 Change-Id: Ie6acc8756f93ae16963cf9e05e0cf94d9039cb10 --- radio/1.4/vts/functional/radio_hidl_hal_api.cpp | 4 ++-- radio/1.4/vts/functional/radio_response.cpp | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/radio/1.4/vts/functional/radio_hidl_hal_api.cpp b/radio/1.4/vts/functional/radio_hidl_hal_api.cpp index 4f347cd53f..ac784626a8 100644 --- a/radio/1.4/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.4/vts/functional/radio_hidl_hal_api.cpp @@ -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"); diff --git a/radio/1.4/vts/functional/radio_response.cpp b/radio/1.4/vts/functional/radio_response.cpp index e7842a9621..eac0c6800f 100644 --- a/radio/1.4/vts/functional/radio_response.cpp +++ b/radio/1.4/vts/functional/radio_response.cpp @@ -533,7 +533,9 @@ Return RadioResponse_v1_4::setCellInfoListRateResponse(const RadioResponse return Void(); } -Return RadioResponse_v1_4::setInitialAttachApnResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_4::setInitialAttachApnResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent_v1_4.notify(info.serial); return Void(); } @@ -604,7 +606,9 @@ Return RadioResponse_v1_4::requestIccSimAuthenticationResponse( return Void(); } -Return RadioResponse_v1_4::setDataProfileResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_4::setDataProfileResponse(const RadioResponseInfo& info) { + rspInfo = info; + parent_v1_4.notify(info.serial); return Void(); }