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

Commit 637d7718 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Disable DnsResolver log in userdebug build"

parents 3d55bc5b 70e9ff94

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;

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);