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

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

Snap for 8748207 from f6ce40da to mainline-tethering-release 

Change-Id: Ic7541c4a3e9dd2ae18f60d706b23c3605d78f42a
parents 72af5890 f6ce40da

PrivateDnsConfiguration.cpp

+2 −5
Original line number Diff line number Diff line
@@ -301,11 +301,8 @@ bool PrivateDnsConfiguration::recordPrivateDnsValidation(const ServerIdentity& i 
    }



    bool reevaluationStatus = NEEDS_REEVALUATION;

    if (success) {

        reevaluationStatus = DONT_REEVALUATE;

    } else if (mode->second == PrivateDnsMode::OFF) {

        reevaluationStatus = DONT_REEVALUATE;

    } else if (mode->second == PrivateDnsMode::OPPORTUNISTIC && !isRevalidation) {

    if (success || (mode->second == PrivateDnsMode::OFF) ||

        (mode->second == PrivateDnsMode::OPPORTUNISTIC && !isRevalidation)) {

        reevaluationStatus = DONT_REEVALUATE;

    }

res_send.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1454,9 +1454,7 @@ int res_tls_send(const std::list<DnsTlsServer>& tlsServers, ResState* statp, con 
            // It's OPPORTUNISTIC mode,

            // hence it's not required to do anything because it'll fallback to UDP.

            case DnsTlsTransport::Response::network_error:

                [[fallthrough]];

            case DnsTlsTransport::Response::internal_error:

                [[fallthrough]];

            default:

                return -1;

        }

tests/dnsresolver_binder_test.cpp

+10 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <gtest/gtest.h>

#include <netdutils/Stopwatch.h>



#include <util.h>

#include "dns_metrics_listener/base_metrics_listener.h"

#include "dns_metrics_listener/test_metrics.h"

#include "unsolicited_listener/unsolicited_event_listener.h"
@@ -621,10 +622,16 @@ TEST_F(DnsResolverBinderTest, setLogSeverity) { 
    EXPECT_TRUE(mDnsResolver->setLogSeverity(IDnsResolver::DNS_RESOLVER_LOG_ERROR).isOk());

    mExpectedLogData.push_back({"setLogSeverity(4)", "setLogSeverity.*4"});



    // Set back to default

    // Set back to default based off resolv_init(), the default is INFO for userdebug builds

    // and is WARNING for the other builds.

    if (isUserDebugBuild()) {

        EXPECT_TRUE(mDnsResolver->setLogSeverity(IDnsResolver::DNS_RESOLVER_LOG_INFO).isOk());

        mExpectedLogData.push_back({"setLogSeverity(2)", "setLogSeverity.*2"});

    } else {

        EXPECT_TRUE(mDnsResolver->setLogSeverity(IDnsResolver::DNS_RESOLVER_LOG_WARNING).isOk());

        mExpectedLogData.push_back({"setLogSeverity(3)", "setLogSeverity.*3"});

    }

}



TEST_F(DnsResolverBinderTest, SetResolverOptions) {

    SKIP_IF_REMOTE_VERSION_LESS_THAN(mDnsResolver.get(), 9);

tests/doh/src/dns_https_frontend.rs

+4 −2
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ use tokio::task::JoinHandle; 
lazy_static! {

    static ref RUNTIME_STATIC: Arc<Runtime> = Arc::new(

        Builder::new_multi_thread()

            .worker_threads(2)

            .max_blocking_threads(1)

            .worker_threads(1)

            .enable_all()

            .thread_name("DohFrontend")

            .build()
@@ -144,6 +143,9 @@ impl DohFrontend { 
            }



            worker_thread.abort();

            RUNTIME_STATIC.block_on(async {

                debug!("worker_thread result: {:?}", worker_thread.await);

            })

        }



        debug!("DohFrontend: stopped: {:?}", self);

tests/resolv_private_dns_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ class BasePrivateDnsTest : public BaseTest { 
        const addrinfo hints = {.ai_socktype = SOCK_DGRAM};

        ScopedAddrinfo result = safe_getaddrinfo(host_name, nullptr, &hints);

        EXPECT_THAT(ToStrings(result),

                    testing::ElementsAreArray({kQueryAnswerAAAA, kQueryAnswerA}));

                    testing::UnorderedElementsAreArray({kQueryAnswerAAAA, kQueryAnswerA}));

    };



    void expectQueries(int dnsQueries, int dotQueries, int dohQueries) {