diff options
| author | Ken Chen <cken@google.com> | 2023-11-17 02:42:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-17 02:42:23 +0000 |
| commit | a904ea8f8131a11ffd065fc4668e70cc727b05a6 (patch) | |
| tree | df0b09c010f807a8f52a0318425a5cba2e65d14a | |
| parent | 1621d5022f7e453140da50d63ef84c62d0697753 (diff) | |
| parent | 833398e950b2eda2b027f05c7be76fc672b13851 (diff) | |
| download | DnsResolver-a904ea8f8131a11ffd065fc4668e70cc727b05a6.tar.gz | |
Merge "Remove redundant log in setResolverConfiguration" into main am: 833398e950
Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2833450
Change-Id: I504c0c489e96b9fb2ffce83ebb1d962c7f742485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | DnsResolver.cpp | 1 | ||||
| -rw-r--r-- | DnsResolver.h | 2 | ||||
| -rw-r--r-- | DnsResolverService.cpp | 12 |
3 files changed, 0 insertions, 15 deletions
diff --git a/DnsResolver.cpp b/DnsResolver.cpp index 5abfaea6..372252d6 100644 --- a/DnsResolver.cpp +++ b/DnsResolver.cpp @@ -68,7 +68,6 @@ bool verifyCallbacks() { DnsResolver* gDnsResolv = nullptr; ResolverNetdCallbacks gResNetdCallbacks; -netdutils::Log gDnsResolverLog("dnsResolver"); uint64_t gApiLevel = 0; DnsResolver* DnsResolver::getInstance() { diff --git a/DnsResolver.h b/DnsResolver.h index 9c2f3d8c..a3819f15 100644 --- a/DnsResolver.h +++ b/DnsResolver.h @@ -21,7 +21,6 @@ #include "DnsQueryLog.h" #include "ResolverController.h" #include "netd_resolv/resolv.h" -#include "netdutils/Log.h" namespace android { namespace net { @@ -48,7 +47,6 @@ class DnsResolver { extern DnsResolver* gDnsResolv; extern ResolverNetdCallbacks gResNetdCallbacks; -extern netdutils::Log gDnsResolverLog; extern uint64_t gApiLevel; } // namespace net diff --git a/DnsResolverService.cpp b/DnsResolverService.cpp index a28daa16..2d7a0e5f 100644 --- a/DnsResolverService.cpp +++ b/DnsResolverService.cpp @@ -197,19 +197,7 @@ binder_status_t DnsResolverService::dump(int fd, const char** args, uint32_t num return ::ndk::ScopedAStatus(AStatus_fromExceptionCodeWithMessage(EX_SECURITY, err.c_str())); } - // TODO: Remove this log after AIDL gen_log supporting more types, b/129732660 - auto entry = - gDnsResolverLog.newEntry() - .prettyFunction(__PRETTY_FUNCTION__) - .args(resolverParams.netId, resolverParams.servers, resolverParams.domains, - resolverParams.sampleValiditySeconds, resolverParams.successThreshold, - resolverParams.minSamples, resolverParams.maxSamples, - resolverParams.baseTimeoutMsec, resolverParams.retryCount, - resolverParams.tlsName, resolverParams.tlsServers); - int res = gDnsResolv->resolverCtrl.setResolverConfiguration(resolverParams); - gResNetdCallbacks.log(entry.returns(res).withAutomaticDuration().toString().c_str()); - return statusFromErrcode(res); } |