Merge "Move Stopwatch to libnetdutils" (7d605b57) · Commits · e / os / android_packages_modules_DnsResolver

DnsProxyListener.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,18 +42,17 @@
		#include <netdutils/OperationLimiter.h>
		#include <netdutils/ResponseCode.h>
		#include <netdutils/Slice.h>
		#include <netdutils/Stopwatch.h>
		#include <netdutils/ThreadUtil.h>
		#include <private/android_filesystem_config.h> // AID_SYSTEM
		#include <resolv.h>
		#include <statslog.h>
		#include <sysutils/SocketClient.h>

		// TODO: Consider moving Stopwatch.h to libnetdutils.
		#include "DnsResolver.h"
		#include "NetdClient.h" // NETID_USE_LOCAL_NAMESERVERS
		#include "NetdPermissions.h"
		#include "ResolverEventReporter.h"
		#include "Stopwatch.h"
		#include "netd_resolv/stats.h" // RCODE_TIMEOUT
		#include "resolv_private.h"

		@@ -62,6 +61,7 @@ using aidl::android::net::metrics::INetdEventListener;
		namespace android {

		using netdutils::ResponseCode;
		using netdutils::Stopwatch;

		namespace net {
		namespace {

+3 −2

Original line number	Diff line number	Diff line
		@@ -27,13 +27,13 @@
		#include <gmock/gmock-matchers.h>
		#include <gtest/gtest.h>
		#include <netdb.h>
		#include <netdutils/Stopwatch.h>

		#include "tests/BaseTestMetricsListener.h"
		#include "tests/TestMetrics.h"

		#include "NetdConstants.h" // SHA256_SIZE
		#include "ResolverStats.h"
		#include "Stopwatch.h"
		#include "dns_responder.h"
		#include "dns_responder_client.h"

		@@ -49,6 +49,7 @@ using android::net::IDnsResolver;
		using android::net::ResolverStats;
		using android::net::metrics::INetdEventListener;
		using android::net::metrics::TestOnDnsEvent;
		using android::netdutils::Stopwatch;

		// TODO: make this dynamic and stop depending on implementation details.
		// Sync from TEST_NETID in dns_responder_client.cpp as resolver_test.cpp does.