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

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

Snap for 11068615 from ca5a0148 to mainline-os-statsd-release 

Change-Id: I4a66f91da5b76e6fb790c99211144a8e934bb93f
parents 2415ff8c ca5a0148

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,

Experiments.h

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ class Experiments { 
            "parallel_lookup_sleep_time",

            "retransmission_time_interval",

            "retry_count",

            "skip_4a_query_on_v6_linklocal_addr",

            "sort_nameservers",

    };

    // This value is used in updateInternal as the default value if any flags can't be found.

OWNERS

+1 −0
Original line number Diff line number Diff line 
# Bug component: 31808

set noparent

file:platform/packages/modules/Connectivity:main:/OWNERS_core_networking

PrivateDnsConfiguration.cpp

+2 −2
Original line number Diff line number Diff line
@@ -534,8 +534,8 @@ base::Result<DnsTlsServer*> PrivateDnsConfiguration::getDotServerLocked( 


    auto iter = netPair->second.find(identity);

    if (iter == netPair->second.end()) {

        return Errorf("Failed to get private DNS: server {{{}/{}}} not found", identity.sockaddr,

                      identity.provider);

        return Errorf("Failed to get private DNS: server {{{}/{}}} not found",

                      identity.sockaddr.toString(), identity.provider);

    }



    return &iter->second;

aidl_api/dnsresolver_aidl_interface/13/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
a1e64ca6e3e9aafead71a3415d939207725d39d5