diff options
author | Jack Yu <jackyu@google.com> | 2019-03-07 20:06:58 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-07 20:06:58 -0800 |
commit | 7b66803fda4b5907f441d0fe01fd9e741e4dfa7b (patch) | |
tree | 4b86e0138d7c972e9afd0262931233469742da72 /radio | |
parent | 498c5d31e0a4586f6d349786331cec62d4ff738e (diff) | |
parent | 62f6566bf1148ec09fd3dc436db3db81a3932fa5 (diff) | |
download | android_hardware_interfaces-7b66803fda4b5907f441d0fe01fd9e741e4dfa7b.tar.gz android_hardware_interfaces-7b66803fda4b5907f441d0fe01fd9e741e4dfa7b.tar.bz2 android_hardware_interfaces-7b66803fda4b5907f441d0fe01fd9e741e4dfa7b.zip |
Merge "Added 1.4 setDataProfile and setInitialAttachApn" am: b6990823f9 am: 3ae436ce52
am: 62f6566bf1
Change-Id: I023d45fb81ef3d7cbdacf53663751a1875377791
Diffstat (limited to 'radio')
-rw-r--r-- | radio/1.4/vts/functional/radio_hidl_hal_api.cpp | 4 | ||||
-rw-r--r-- | 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 8e1dc3e3f..76d87585a 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 e7842a962..eac0c6800 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(); } |