Fix setResolverConfiguration to return negative error code
This fixes the logging bug in dumpsys netd.
For example, when resolv_set_nameservers fails:
It used to print
setResolverConfiguration() -> ServiceSpecificException(-22, "Unknown error -22") <0.18ms>
After the fix, it prints
setResolverConfiguration() -> ServiceSpecificException(22, "Invalid argument") <0.28ms>
Test: m com.android.resolv
Change-Id: I916e6e31dcdd2f421592e8ca71663ffbddc7b3b5
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,
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,