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

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

Snap for 7642458 from 0b61f467 to mainline-os-statsd-release 

Change-Id: Ida40ca66ba06b23ad9e98adc682e513b9f8be97a
parents 0990e964 0b61f467

Android.bp

+9 −6
Original line number Diff line number Diff line
@@ -53,12 +53,12 @@ cc_library_headers { 
    ],

}



dnsresolver_aidl_interface_lateststable_version = "V8"

dnsresolver_aidl_interface_lateststable_version = "V9"



cc_library_static {

    name: "dnsresolver_aidl_interface-lateststable-ndk_platform",

    name: "dnsresolver_aidl_interface-lateststable-ndk",

    whole_static_libs: [

        "dnsresolver_aidl_interface-" + dnsresolver_aidl_interface_lateststable_version + "-ndk_platform",

        "dnsresolver_aidl_interface-" + dnsresolver_aidl_interface_lateststable_version + "-ndk",

    ],

    apex_available: [

        "com.android.resolv",
@@ -106,6 +106,7 @@ aidl_interface { 
        "6",

        "7",

        "8",

        "9",

    ],

    dumpapi: {

        no_license: true,
@@ -191,7 +192,7 @@ cc_library { 
    // Link most things statically to minimize our dependence on system ABIs.

    stl: "libc++_static",

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk",

        "libbase",

        "libcutils",

        "libnetdutils",
@@ -200,7 +201,7 @@ cc_library { 
        "libstatslog_resolv",

        "libstatspush_compat",

        "libsysutils",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk",

        "server_configurable_flags",

        "stats_proto",

    ],
@@ -400,7 +401,9 @@ rust_ffi_static { 
        "liburl",

    ],

    prefer_rlib: true,



    // TODO(b/194022174), for unit tests to run on the Android 10 platform,

    // libunwind must be statically linked.

    whole_static_libs: ["libunwind"],

    apex_available: [

        "//apex_available:platform",  // Needed by doh_ffi_test

        "com.android.resolv"

DnsResolver.cpp

+3 −1
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ bool resolv_init(const ResolverNetdCallbacks* callbacks) { 
    android::base::SetDefaultTag("libnetd_resolv");

    LOG(INFO) << __func__ << ": Initializing resolver";

    // TODO(b/170539625): restore log level to WARNING after clarifying flaky tests.

    resolv_set_log_severity(isUserDebugBuild() ? android::base::DEBUG : android::base::WARNING);

    const bool isDebug = isUserDebugBuild();

    resolv_set_log_severity(isDebug ? android::base::DEBUG : android::base::WARNING);

    doh_init_logger(isDebug ? LOG_LEVEL_DEBUG : LOG_LEVEL_WARN);

    using android::net::gApiLevel;

    gApiLevel = getApiLevel();

    using android::net::gResNetdCallbacks;

DnsResolverService.cpp

+9 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "ResolverEventReporter.h"

#include "resolv_cache.h"



using aidl::android::net::ResolverOptionsParcel;

using aidl::android::net::ResolverParamsParcel;

using android::base::Join;

using android::base::StringPrintf;
@@ -307,5 +308,13 @@ binder_status_t DnsResolverService::dump(int fd, const char** args, uint32_t num 
    return statusFromErrcode(res);

}



::ndk::ScopedAStatus DnsResolverService::setResolverOptions(int32_t netId,

                                                            const ResolverOptionsParcel& options) {

    // Locking happens in res_cache.cpp functions.

    ENFORCE_NETWORK_STACK_PERMISSIONS();



    return statusFromErrcode(resolv_set_options(netId, options));

}



}  // namespace net

}  // namespace android

DnsResolverService.h

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ class DnsResolverService : public aidl::android::net::BnDnsResolver { 
    ::ndk::ScopedAStatus destroyNetworkCache(int32_t netId) override;

    ::ndk::ScopedAStatus createNetworkCache(int32_t netId) override;

    ::ndk::ScopedAStatus flushNetworkCache(int32_t netId) override;

    ::ndk::ScopedAStatus setResolverOptions(

            int32_t netId, const aidl::android::net::ResolverOptionsParcel& options) override;



    // DNS64-related commands

    ::ndk::ScopedAStatus startPrefix64Discovery(int32_t netId) override;

DnsTlsServer.h

+3 −2
Original line number Diff line number Diff line
@@ -35,8 +35,9 @@ struct DnsTlsServer : public IPrivateDnsServer { 
    // Default constructor.

    DnsTlsServer() {}



    // Allow sockaddr_storage to be promoted to DnsTlsServer automatically.

    DnsTlsServer(const sockaddr_storage& ss) : ss(ss) {}

    explicit DnsTlsServer(const netdutils::IPAddress& ip)

        : DnsTlsServer(netdutils::IPSockAddr(ip, 853)) {}

    explicit DnsTlsServer(const netdutils::IPSockAddr& addr) : ss(addr) {}



    // The server location, including IP and port.

    // TODO: make it const.