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

Commit 741f0f1d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11119596 from 52afb18f to mainline-healthfitness-release 

Change-Id: Iee4a14ea9c2e6ed79b21137fcff9fc5ea155e32f
parents 04e1d2ad 52afb18f

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 −14
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ binder_status_t DnsResolverService::start() { 


    ABinderProcess_startThreadPool();



    // TODO: register log callback if binder NDK backend support it. b/126501406



    return STATUS_OK;

}
@@ -199,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);

}

tests/Android.bp

+6 −4
Original line number Diff line number Diff line
@@ -192,22 +192,24 @@ cc_test { 
    ],

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk",

        "libc++fs",

        "libconnectivity_native_test_utils",

        "libcrypto_static",

        "libcutils",

        "libdoh_frontend_ffi",

        "libgmock",

        "libip_checksum",

        "libmodules-utils-build",

        "libnetd_test_dnsresponder_ndk",

        "libnetd_test_metrics_listener",

        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libnettestutils",

        "libssl",

        "libc++fs",

        "libcutils",

        "libutils",

        "netd_aidl_interface-lateststable-ndk",

        "netd_event_listener_interface-lateststable-ndk",

        "libip_checksum",

        "resolv_unsolicited_listener",

        "libdoh_frontend_ffi",

    ],

    // This test talks to the DnsResolver module over a binary protocol on a socket, so keep it as

    // multilib setting is worth because we might be able to get some coverage for the case where

tests/dns_responder/dns_responder_client_ndk.cpp

+0 −16
Original line number Diff line number Diff line
@@ -117,22 +117,6 @@ Result<ResolverInfo> DnsResponderClient::getResolverInfo() { 
    return std::move(out);

}



bool DnsResponderClient::SetResolversForNetwork(const std::vector<std::string>& servers,

                                                const std::vector<std::string>& domains,

                                                std::vector<int> params) {

    params.resize(IDnsResolver::RESOLVER_PARAMS_COUNT);

    std::array<int, IDnsResolver::RESOLVER_PARAMS_COUNT> arr;

    std::copy_n(params.begin(), arr.size(), arr.begin());

    const auto resolverParams = ResolverParams::Builder()

                                        .setDomains(domains)

                                        .setDnsServers(servers)

                                        .setDotServers({})

                                        .setParams(arr)

                                        .build();

    const auto rv = mDnsResolvSrv->setResolverConfiguration(resolverParams);

    return rv.isOk();

}



bool DnsResponderClient::SetResolversForNetwork(const std::vector<std::string>& servers,

                                                const std::vector<std::string>& domains) {

    const auto resolverParams = ResolverParams::Builder()