diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-23 02:35:04 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-23 02:35:04 +0000 |
| commit | 6f11e984b1373c22a1601d95b4fe647271479929 (patch) | |
| tree | 4150ce6834d03c194fd31c801c7413cb6d547d36 | |
| parent | bd20194bf53f257a26d9d987d42651e3ee062612 (diff) | |
| parent | d97f8714f07a762efe5a48747454fb4bdd51be8b (diff) | |
| download | platform_hardware_interfaces-6f11e984b1373c22a1601d95b4fe647271479929.tar.gz platform_hardware_interfaces-6f11e984b1373c22a1601d95b4fe647271479929.tar.bz2 platform_hardware_interfaces-6f11e984b1373c22a1601d95b4fe647271479929.zip | |
Snap for 4411005 from d97f8714f07a762efe5a48747454fb4bdd51be8b to oc-mr1-release
Change-Id: I51e8c1630d4e0f432237b3c6a093754828723122
| -rw-r--r-- | tetheroffload/config/1.0/vts/functional/VtsHalTetheroffloadConfigV1_0TargetTest.cpp | 4 | ||||
| -rw-r--r-- | tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tetheroffload/config/1.0/vts/functional/VtsHalTetheroffloadConfigV1_0TargetTest.cpp b/tetheroffload/config/1.0/vts/functional/VtsHalTetheroffloadConfigV1_0TargetTest.cpp index 2cbe479dc9..bf211f0a00 100644 --- a/tetheroffload/config/1.0/vts/functional/VtsHalTetheroffloadConfigV1_0TargetTest.cpp +++ b/tetheroffload/config/1.0/vts/functional/VtsHalTetheroffloadConfigV1_0TargetTest.cpp @@ -43,8 +43,8 @@ using android::sp; #define ASSERT_FALSE_CALLBACK \ [&](bool success, const hidl_string& errMsg) { ASSERT_FALSE(success) << errMsg.c_str(); } -const unsigned kFd1Groups = NFNLGRP_CONNTRACK_NEW | NFNLGRP_CONNTRACK_DESTROY; -const unsigned kFd2Groups = NFNLGRP_CONNTRACK_UPDATE | NFNLGRP_CONNTRACK_DESTROY; +const unsigned kFd1Groups = NF_NETLINK_CONNTRACK_NEW | NF_NETLINK_CONNTRACK_DESTROY; +const unsigned kFd2Groups = NF_NETLINK_CONNTRACK_UPDATE | NF_NETLINK_CONNTRACK_DESTROY; inline const sockaddr* asSockaddr(const sockaddr_nl* nladdr) { return reinterpret_cast<const sockaddr*>(nladdr); diff --git a/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp b/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp index c009af5d91..d572728eaa 100644 --- a/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp +++ b/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp @@ -131,7 +131,7 @@ class OffloadControlHidlTestBase : public testing::VtsHalHidlTargetTestBase { config = testing::VtsHalHidlTargetTestBase::getService<IOffloadConfig>(); ASSERT_NE(nullptr, config.get()) << "Could not get HIDL instance"; - unique_fd fd1(conntrackSocket(NFNLGRP_CONNTRACK_NEW | NFNLGRP_CONNTRACK_DESTROY)); + unique_fd fd1(conntrackSocket(NF_NETLINK_CONNTRACK_NEW | NF_NETLINK_CONNTRACK_DESTROY)); if (fd1.get() < 0) { ALOGE("Unable to create conntrack handles: %d/%s", errno, strerror(errno)); FAIL(); @@ -141,7 +141,7 @@ class OffloadControlHidlTestBase : public testing::VtsHalHidlTargetTestBase { hidl_handle h1; h1.setTo(nativeHandle1, true); - unique_fd fd2(conntrackSocket(NFNLGRP_CONNTRACK_UPDATE | NFNLGRP_CONNTRACK_DESTROY)); + unique_fd fd2(conntrackSocket(NF_NETLINK_CONNTRACK_UPDATE | NF_NETLINK_CONNTRACK_DESTROY)); if (fd2.get() < 0) { ALOGE("Unable to create conntrack handles: %d/%s", errno, strerror(errno)); FAIL(); |