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

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

Snap for 7515399 from 50a83d13 to tm-release 

Change-Id: Ie277fddeef53184154a9702547d5d1eb90380c8f
parents 1015b0b0 50a83d13

DnsTlsTransport.cpp

+5 −3
Original line number Diff line number Diff line
@@ -301,9 +301,11 @@ bool DnsTlsTransport::validate(const DnsTlsServer& server, uint32_t mark) { 
    //

    // For instance, with latencyFactor = 3 and latencyOffsetMs = 10, if UDP probe latency is 5 ms,

    // DoT probe latency must less than 25 ms.

    int latencyFactor = Experiments::getInstance()->getFlag("dot_validation_latency_factor", -1);

    int latencyOffsetMs =

            Experiments::getInstance()->getFlag("dot_validation_latency_offset_ms", -1);

    const bool versionHigherThanAndroidR = getApiLevel() >= 30;

    int latencyFactor = Experiments::getInstance()->getFlag("dot_validation_latency_factor",

                                                            (versionHigherThanAndroidR ? 3 : -1));

    int latencyOffsetMs = Experiments::getInstance()->getFlag(

            "dot_validation_latency_offset_ms", (versionHigherThanAndroidR ? 100 : -1));

    const bool shouldCompareUdpLatency =

            server.name.empty() &&

            (latencyFactor >= 0 && latencyOffsetMs >= 0 && latencyFactor + latencyOffsetMs != 0);

tests/resolv_integration_test.cpp

+11 −2
Original line number Diff line number Diff line
@@ -4760,8 +4760,17 @@ TEST_F(ResolverTest, TlsServerRevalidation) { 
        resetNetwork();



        // This test is sensitive to the number of queries sent in DoT validation.

        const int latencyFactor = std::stoi(GetProperty(kDotValidationLatencyFactorFlag, "-1"));

        const int latencyOffsetMs = std::stoi(GetProperty(kDotValidationLatencyOffsetMsFlag, "-1"));

        int latencyFactor;

        int latencyOffsetMs;

        if (isAtLeastR) {

            // The feature is enabled by default in R.

            latencyFactor = std::stoi(GetProperty(kDotValidationLatencyFactorFlag, "3"));

            latencyOffsetMs = std::stoi(GetProperty(kDotValidationLatencyOffsetMsFlag, "100"));

        } else {

            // The feature is disabled by default in Q.

            latencyFactor = std::stoi(GetProperty(kDotValidationLatencyFactorFlag, "-1"));

            latencyOffsetMs = std::stoi(GetProperty(kDotValidationLatencyOffsetMsFlag, "-1"));

        }

        const bool dotValidationExtraProbes = (config.dnsMode == "OPPORTUNISTIC") &&

                                              (latencyFactor >= 0 && latencyOffsetMs >= 0 &&

                                               latencyFactor + latencyOffsetMs != 0);