commit da77e8e2c19364e6045ede9b446089877e48d2f4
author Mike Yu <yumike@google.com> Mon Nov 26 13:26:21 2018 +0900
committer Mike Yu <yumike@google.com> Wed Nov 28 13:13:27 2018 +0900
tree c29cf3deb524fa19cff3f57f23164fef721b292d
parent dc4c37e2f83033a2a6e704b61ae1e2356b44c3c2

Add the tests for ResolverStats

Add the test coverage for resolver stats. Also check and prune the
parameters in setResolverConfiguration() if they exceed the maximum
number predefined in params.h, and delete commented code.

Bug: 119694273
Test: system/netd/tests/runtests.sh passed

Change-Id: I265a2f03edd4fbc6df97270a782be5e639dfc5f8

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index 3758991..3e153ec 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -520,13 +520,16 @@
     return binder::Status::ok();
 }
 
-binder::Status NetdNativeService::getResolverInfo(int32_t netId,
-        std::vector<std::string>* servers, std::vector<std::string>* domains,
-        std::vector<int32_t>* params, std::vector<int32_t>* stats) {
+binder::Status NetdNativeService::getResolverInfo(int32_t netId, std::vector<std::string>* servers,
+                                                  std::vector<std::string>* domains,
+                                                  std::vector<std::string>* tlsServers,
+                                                  std::vector<int32_t>* params,
+                                                  std::vector<int32_t>* stats) {
     // This function intentionally does not lock within Netd, as Bionic is thread-safe.
-    ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
+    ENFORCE_PERMISSION(NETWORK_STACK);
 
-    int err = gCtls->resolverCtrl.getResolverInfo(netId, servers, domains, params, stats);
+    int err =
+            gCtls->resolverCtrl.getResolverInfo(netId, servers, domains, tlsServers, params, stats);
     if (err != 0) {
         return binder::Status::fromServiceSpecificError(-err,
                 String8::format("ResolverController error: %s", strerror(-err)));