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

Commit 1515c843 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11182773 from 15c0a3e5 to mainline-appsearch-release 

Change-Id: I4d7315d92bd3ff6a064b29202d9e9a138b90eb94
parents 748853fe 15c0a3e5

Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ cc_library_headers { 
    ],

}



dnsresolver_aidl_interface_lateststable_version = "V12"

dnsresolver_aidl_interface_lateststable_version = "V13"



cc_library_static {

    name: "dnsresolver_aidl_interface-lateststable-ndk",
@@ -149,6 +149,10 @@ aidl_interface { 
            version: "12",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "13",

            imports: ["netd_event_listener_interface-V1"],

        },



    ],

    frozen: true,

DnsProxyListener.cpp

+12 −5
Original line number Diff line number Diff line
@@ -336,11 +336,12 @@ void reportDnsEvent(int eventType, const android_net_context& netContext, int la 
        stats::BytesField dnsQueryBytesField{dnsQueryStats.c_str(), dnsQueryStats.size()};

        event.set_return_code(static_cast<ReturnCode>(returnCode));

        event.set_network_type(resolv_get_network_types_for_net(netContext.dns_netid));

        android::net::stats::stats_write(android::net::stats::NETWORK_DNS_EVENT_REPORTED,

                                         event.event_type(), event.return_code(),

                                         event.latency_micros(), event.hints_ai_flags(),

                                         event.res_nsend_flags(), event.network_type(),

                                         event.private_dns_modes(), dnsQueryBytesField, rate);

        event.set_uid(netContext.uid);

        android::net::stats::stats_write(

                android::net::stats::NETWORK_DNS_EVENT_REPORTED, event.event_type(),

                event.return_code(), event.latency_micros(), event.hints_ai_flags(),

                event.res_nsend_flags(), event.network_type(), event.private_dns_modes(),

                dnsQueryBytesField, rate, event.uid());

    }



    maybeLogQuery(eventType, netContext, event, query_name, ip_addrs);
@@ -708,6 +709,12 @@ bool isUidNetworkingBlocked(uid_t uid, unsigned netId) { 
    // application's UID. Its DNS packets are not subject to certain network restriction features.

    if (resolv_is_enforceDnsUid_enabled_network(netId)) return false;



    // Feature flag that can disable the feature.

    if (!android::net::Experiments::getInstance()->getFlag("fail_fast_on_uid_network_blocking",

                                                           1)) {

        return false;

    }



    return (*ADnsHelper_isUidNetworkingBlocked)(uid, resolv_is_metered_network(netId)) == 1;

}

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);

}