commit 7b66803fda4b5907f441d0fe01fd9e741e4dfa7b
author Jack Yu <jackyu@google.com> Thu Mar 07 20:06:58 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Mar 07 20:06:58 2019 -0800
tree 4b86e0138d7c972e9afd0262931233469742da72
parent 498c5d31e0a4586f6d349786331cec62d4ff738e
parent 62f6566bf1148ec09fd3dc436db3db81a3932fa5

Merge "Added 1.4 setDataProfile and setInitialAttachApn" am: b6990823f9 am: 3ae436ce52
am: 62f6566bf1

Change-Id: I023d45fb81ef3d7cbdacf53663751a1875377791

radio/1.4/vts/functional/radio_hidl_hal_api.cpp

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 8e1dc3e..76d8758 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 @@
     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");

radio/1.4/vts/functional/radio_response.cpp

diff --git a/radio/1.4/vts/functional/radio_response.cpp b/radio/1.4/vts/functional/radio_response.cpp
index e7842a9..eac0c68 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();
 }
 
-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();
 }
 
-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();
 }