commit e635220095c61d7528f4e8fd9e967b982e54558d
author Bernie Innocenti <codewiz@google.com> Thu Oct 10 01:19:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 10 01:19:09 2019 +0000
tree 9063d4d804f64f825c6de7065574afca53b2d2b5
parent 0a423e4b35dacada4996cbf252a4f537feb1265a
parent bb33074673dd334b3ff2cfd9f6cc6eb67533db86

Merge changes I4585b9d7,I90b48eab,I1f3e38d2

* changes:
  Delete the _u._ext nonsense from res_state
  Delete nameserver config change detection in res_nsend
  Inline res_state_ext into res_state

ResolverController.cpp

diff --git a/ResolverController.cpp b/ResolverController.cpp
index 3d5b10c..bdc6558 100644
--- a/ResolverController.cpp
+++ b/ResolverController.cpp
@@ -226,8 +226,8 @@
     res_params.base_timeout_msec = resolverParams.baseTimeoutMsec;
     res_params.retry_count = resolverParams.retryCount;
 
-    return -resolv_set_nameservers(resolverParams.netId, resolverParams.servers,
-                                   resolverParams.domains, res_params);
+    return resolv_set_nameservers(resolverParams.netId, resolverParams.servers,
+                                  resolverParams.domains, res_params);
 }
 
 int ResolverController::getResolverInfo(int32_t netId, std::vector<std::string>* servers,

ResolverController.h

diff --git a/ResolverController.h b/ResolverController.h
index a4ea477..4ff395b 100644
--- a/ResolverController.h
+++ b/ResolverController.h
@@ -42,7 +42,7 @@
     int getPrefix64(unsigned netId, netdutils::IPPrefix* prefix);
 
     // Binder specific functions, which convert between the ResolverParamsParcel and the
-    // actual data structures, and call setDnsServer() / getDnsInfo() for the actual processing.
+    // actual data structures.
     int setResolverConfiguration(const aidl::android::net::ResolverParamsParcel& resolverParams);
 
     int getResolverInfo(int32_t netId, std::vector<std::string>* servers,