• R/O
  • HTTP
  • SSH
  • HTTPS

提交

标签
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythongamewindowsbathyscaphephpguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

hardware/interfaces


Commit MetaInfo

修订版6f11e984b1373c22a1601d95b4fe647271479929 (tree)
时间2017-10-23 11:35:04
作者android-build-team Robot <android-build-team-robot@goog...>
Commiterandroid-build-team Robot

Log Message

Snap for 4411005 from d97f8714f07a762efe5a48747454fb4bdd51be8b to oc-mr1-release

Change-Id: I51e8c1630d4e0f432237b3c6a093754828723122

更改概述

差异

--- 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();