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

Commit 15273288 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7013194 from dc29ec7e to sc-d1-release 

Change-Id: I232d5cfd45a1ad32b5acea6cb33f1005fe633b24
parents 7f924b4c dc29ec7e

Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ cc_library_headers { 
cc_library_headers {

    name: "dnsproxyd_protocol_headers",

    export_include_dirs: ["include/dnsproxyd_protocol"],

    apex_available: [

        "//apex_available:platform",

        "com.android.tethering",

    ],

}



aidl_interface {

res_cache.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1016,9 +1016,13 @@ struct NetConfig { 
    // Map format: ReturnCode:rate_denom

    std::unordered_map<int, uint32_t> dns_event_subsampling_map;

    DnsStats dnsStats;



    // Customized hostname/address table will be stored in customizedTable.

    // If resolverParams.hosts is empty, the existing customized table will be erased.

    typedef std::multimap<std::string /* hostname */, std::string /* IPv4/IPv6 address */>

            HostMapping;

    HostMapping customizedTable = {};



    int tc_mode = aidl::android::net::IDnsResolver::TC_MODE_DEFAULT;

    bool enforceDnsUid = false;

    std::vector<int32_t> transportTypes;

resolv_cache.h

+0 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ 
// The name servers are retrieved from the cache which is associated

// with the network to which ResState is associated.

struct ResState;



typedef std::multimap<std::string /* hostname */, std::string /* IPv4/IPv6 address */> HostMapping;



void resolv_populate_res_for_net(ResState* statp);



std::vector<unsigned> resolv_list_caches();