Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 833398e9 authored by Ken Chen's avatar Ken Chen Committed by Gerrit Code Review
Browse files

Merge "Remove redundant log in setResolverConfiguration" into main

parents 602b5933 eb327b91

DnsResolver.cpp

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ bool verifyCallbacks() { 


DnsResolver* gDnsResolv = nullptr;

ResolverNetdCallbacks gResNetdCallbacks;

netdutils::Log gDnsResolverLog("dnsResolver");

uint64_t gApiLevel = 0;



DnsResolver* DnsResolver::getInstance() {

DnsResolver.h

+0 −2
Original line number Diff line number Diff line
@@ -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

DnsResolverService.cpp

+0 −12
Original line number Diff line number Diff line
@@ -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);

}