summaryrefslogtreecommitdiffstats
path: root/radio/1.4
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2019-03-08 01:38:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-03-08 01:38:47 +0000
commitb6990823f92d4a94606144938e6d4c42486c9338 (patch)
treee546ffb385eeae6927ed578a94ff90705967fc8f /radio/1.4
parentcaec5406aea4d46a7cbb5057eca2297cd4105f75 (diff)
parentf666f424156b723e1f94f1aa68839493323aa9bd (diff)
downloadplatform_hardware_interfaces-b6990823f92d4a94606144938e6d4c42486c9338.tar.gz
platform_hardware_interfaces-b6990823f92d4a94606144938e6d4c42486c9338.tar.bz2
platform_hardware_interfaces-b6990823f92d4a94606144938e6d4c42486c9338.zip
Merge "Added 1.4 setDataProfile and setInitialAttachApn"
Diffstat (limited to 'radio/1.4')
-rw-r--r--radio/1.4/vts/functional/radio_hidl_hal_api.cpp4
-rw-r--r--radio/1.4/vts/functional/radio_response.cpp8
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<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();
}