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

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

Snap for 8358831 from 01eb5e75 to mainline-go-networking-release 

Change-Id: Ibd6086f466dd3515ec41d899b4a9c747d8b96bd5
parents b74a55d9 01eb5e75

DnsResolver.cpp

+2 −4
Original line number Diff line number Diff line
@@ -31,10 +31,8 @@ 
bool resolv_init(const ResolverNetdCallbacks* callbacks) {

    android::base::InitLogging(/*argv=*/nullptr);

    LOG(INFO) << __func__ << ": Initializing resolver";

    // TODO(b/170539625): restore log level to WARNING after clarifying flaky tests.

    const bool isDebug = isUserDebugBuild();

    resolv_set_log_severity(isDebug ? android::base::DEBUG : android::base::WARNING);

    doh_init_logger(isDebug ? DOH_LOG_LEVEL_DEBUG : DOH_LOG_LEVEL_WARN);

    resolv_set_log_severity(android::base::WARNING);

    doh_init_logger(DOH_LOG_LEVEL_WARN);

    using android::net::gApiLevel;

    gApiLevel = getApiLevel();

    using android::net::gResNetdCallbacks;

binder/android/net/TEST_MAPPING

+5 −0
Original line number Diff line number Diff line
@@ -3,5 +3,10 @@ 
        {

            "name": "FrameworksNetTests"

        }

    ],

    "hwasan-postsubmit": [

        {

            "name": "FrameworksNetTests"

        }

    ]

}

util.h

+0 −5
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ inline uint64_t getApiLevel() { 
    return std::max(buildVersionSdk + !!buildVersionPreviewSdk, firstApiLevel);

}



// It's the identical strategy as frameworks/base/core/java/android/os/Build.java did.

inline bool isUserDebugBuild() {

    return (android::base::GetProperty("ro.build.type", "user") == "userdebug");

}



inline bool isDoHEnabled() {

    static bool isAtLeastT = android::modules::sdklevel::IsAtLeastT();

    return android::net::Experiments::getInstance()->getFlag("doh", isAtLeastT ? 1 : 0);