Snap for 6314039 from 3d744e75e83c7cb380e1404cd08d9dc02d01d8de to sc-release (103de783) · Commits · e / os / android_packages_modules_DnsResolver

Android.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -196,17 +196,17 @@ cc_test {
		"DnsQueryLogTest.cpp",
		],
		shared_libs: [
		"libbase",
		"libcrypto",
		"libcutils",
		"libssl",
		"libbinder_ndk",
		"liblog",
		"libssl",
		],
		static_libs: [
		"dnsresolver_aidl_interface-unstable-ndk_platform",
		"netd_event_listener_interface-ndk_platform",
		"libcutils",
		"libbase",
		"libgmock",
		"liblog",
		"libnetd_resolv",
		"libnetd_test_dnsresponder",
		"libnetd_test_resolv_utils",

+4 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,10 @@ int PrivateDnsConfiguration::set(int32_t netId, uint32_t mark,
		mPrivateDnsTransports.erase(netId);
		resolv_stats_set_servers_for_dot(netId, {});
		mPrivateDnsValidateThreads.erase(netId);
		// TODO: As mPrivateDnsValidateThreads is reset, validation threads which haven't yet
		// finished are considered outdated. Consider signaling the outdated validation threads to
		// stop them from updating the state of PrivateDnsConfiguration (possibly disallow them to
		// report onPrivateDnsValidationEvent).
		return 0;
		}

+12 −7

Original line number	Diff line number	Diff line
		@@ -46,8 +46,9 @@ cc_test {
		"libnetd_client_headers",
		],
		shared_libs: [
		"libbinder_ndk",
		"libcrypto",
		"libbinder_ndk",
		"liblog",
		"libssl",
		],
		static_libs: [
		@@ -55,7 +56,6 @@ cc_test {
		"golddata_proto",
		"libbase",
		"libgmock",
		"liblog",
		"libnetd_resolv",
		"libnetd_test_dnsresponder_ndk",
		"libnetd_test_resolv_utils",
		@@ -83,17 +83,18 @@ cc_test {
		"libnetd_resolv_headers",
		],
		shared_libs: [
		"libbase",
		"libbinder_ndk",
		"liblog",
		"libnetd_client",
		"libutils",
		],
		static_libs: [
		"dnsresolver_aidl_interface-ndk_platform",
		"libbase",
		"libgmock",
		"libnetd_test_dnsresponder_ndk",
		"libnetd_test_resolv_utils",
		"libnetdutils",
		"libutils",
		"netd_event_listener_interface-ndk_platform",
		"netd_aidl_interface-ndk_platform",
		],
		@@ -119,6 +120,7 @@ cc_test {
		//stl: "libc++_static",
		shared_libs: [
		"libbinder_ndk",
		"liblog",
		"libnetd_client",
		],
		static_libs: [
		@@ -127,7 +129,6 @@ cc_test {
		"libbpf_android",
		"libcrypto_static",
		"libgmock",
		"liblog",
		"libnetd_test_dnsresponder_ndk",
		"libnetd_test_metrics_listener",
		"libnetd_test_resolv_utils",
		@@ -157,10 +158,12 @@ cc_test_library {
		],
		defaults: ["netd_defaults"],
		export_include_dirs: ["."],
		shared_libs: [
		"liblog",
		],
		static_libs: [
		"libbase",
		"libgmock",
		"liblog",
		"libnetdutils",
		"libprotobuf-cpp-lite",
		"stats_proto",
		@@ -174,10 +177,12 @@ cc_test {
		],
		defaults: ["netd_defaults"],
		test_suites: ["device-tests"],
		shared_libs: [
		"liblog",
		],
		static_libs: [
		"libbase",
		"libgmock",
		"liblog",
		"libprotobuf-cpp-lite",
		"resolv_stats_test_utils",
		"stats_proto",

+7 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,13 @@ class DnsMetricsListener : public BaseMetricsListener {
		// Wait for the expected private DNS validation result until timeout.
		bool waitForPrivateDnsValidation(const std::string& serverAddr, const bool validated);

		// Return true if a validation result for \|serverAddr\| is found; otherwise, return false.
		// Only exists for testing.
		bool findValidationRecord(const std::string& serverAddr) const EXCLUDES(mMutex) {
		std::lock_guard lock(mMutex);
		return mValidationRecords.find({mNetId, serverAddr}) != mValidationRecords.end();
		}

		private:
		typedef std::pair<int32_t, std::string> ServerKey;

+1 −0

Original line number	Diff line number	Diff line
		@@ -200,6 +200,7 @@ void DnsTlsFrontend::requestHandler() {
		break;
		}

		accept_connection_count_++;
		if (hangOnHandshake_) {
		LOG(DEBUG) << "TEST ONLY: unresponsive to SSL handshake";