Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS

hardware-interfaces: Commit

hardware/interfaces


Commit MetaInfo

Révisiond97f8714f07a762efe5a48747454fb4bdd51be8b (tree)
l'heure2017-10-20 18:33:40
AuteurErik Kline <ek@goog...>
CommiterErik Kline

Message de Log

Fixup netlink socket creation to make corresponding fix in JNI

Corresponding JNI fix is:

aosp/516339
oc-mr1-dev:3102743

Test: as follows

- built
- flashed
- booted
- make vts -j30 BUILD_GOOGLE_VTS=true && \
vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalTetherOffloadControlV1_0Target -l DEBUG
10-20 17:48:28 I/ResultReporter: Invocation finished in 5m 32s. PASSED: 38, FAILED: 0, MODULES: 1 of 1

Bug: 68018148

Change-Id: I5aa019d708abaff61387b83a857e9e8226709842

Change Summary

Modification

--- 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;
4343 #define ASSERT_FALSE_CALLBACK \
4444 [&](bool success, const hidl_string& errMsg) { ASSERT_FALSE(success) << errMsg.c_str(); }
4545
46-const unsigned kFd1Groups = NFNLGRP_CONNTRACK_NEW | NFNLGRP_CONNTRACK_DESTROY;
47-const unsigned kFd2Groups = NFNLGRP_CONNTRACK_UPDATE | NFNLGRP_CONNTRACK_DESTROY;
46+const unsigned kFd1Groups = NF_NETLINK_CONNTRACK_NEW | NF_NETLINK_CONNTRACK_DESTROY;
47+const unsigned kFd2Groups = NF_NETLINK_CONNTRACK_UPDATE | NF_NETLINK_CONNTRACK_DESTROY;
4848
4949 inline const sockaddr* asSockaddr(const sockaddr_nl* nladdr) {
5050 return reinterpret_cast<const sockaddr*>(nladdr);
--- 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 {
131131 config = testing::VtsHalHidlTargetTestBase::getService<IOffloadConfig>();
132132 ASSERT_NE(nullptr, config.get()) << "Could not get HIDL instance";
133133
134- unique_fd fd1(conntrackSocket(NFNLGRP_CONNTRACK_NEW | NFNLGRP_CONNTRACK_DESTROY));
134+ unique_fd fd1(conntrackSocket(NF_NETLINK_CONNTRACK_NEW | NF_NETLINK_CONNTRACK_DESTROY));
135135 if (fd1.get() < 0) {
136136 ALOGE("Unable to create conntrack handles: %d/%s", errno, strerror(errno));
137137 FAIL();
@@ -141,7 +141,7 @@ class OffloadControlHidlTestBase : public testing::VtsHalHidlTargetTestBase {
141141 hidl_handle h1;
142142 h1.setTo(nativeHandle1, true);
143143
144- unique_fd fd2(conntrackSocket(NFNLGRP_CONNTRACK_UPDATE | NFNLGRP_CONNTRACK_DESTROY));
144+ unique_fd fd2(conntrackSocket(NF_NETLINK_CONNTRACK_UPDATE | NF_NETLINK_CONNTRACK_DESTROY));
145145 if (fd2.get() < 0) {
146146 ALOGE("Unable to create conntrack handles: %d/%s", errno, strerror(errno));
147147 FAIL();
Afficher sur ancien navigateur de dépôt.