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

Commit 8d80d8c4 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Merge "Omit namespace android::net::Experiments" am: ec13272e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2275599



Change-Id: I661002b04bcd2c62a1c629a8a1239c6f78b0e440
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5f6f0dc ec13272e

getaddrinfo.cpp

+3 −4
Original line number Diff line number Diff line
@@ -1668,8 +1668,8 @@ static int res_queryN_parallel(const char* name, res_target* target, ResState* r 
        // Avoiding gateways drop packets if queries are sent too close together

        // Only needed if we have multiple queries in a row.

        if (t->next) {

            int sleepFlag = android::net::Experiments::getInstance()->getFlag(

                    "parallel_lookup_sleep_time", SLEEP_TIME_MS);

            int sleepFlag = Experiments::getInstance()->getFlag("parallel_lookup_sleep_time",

                                                                SLEEP_TIME_MS);

            if (sleepFlag > 1000) sleepFlag = 1000;

            sleepTimeMs = std::chrono::milliseconds(sleepFlag);

        }
@@ -1699,8 +1699,7 @@ static int res_queryN_parallel(const char* name, res_target* target, ResState* r 
}



static int res_queryN_wrapper(const char* name, res_target* target, ResState* res, int* herrno) {

    const bool parallel_lookup =

            android::net::Experiments::getInstance()->getFlag("parallel_lookup_release", 1);

    const bool parallel_lookup = Experiments::getInstance()->getFlag("parallel_lookup_release", 1);

    if (parallel_lookup) return res_queryN_parallel(name, target, res, herrno);



    return res_queryN(name, target, res, herrno);