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

Commit 576a1b78 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable DnsResolver log in userdebug build" am: 637d7718 am: cbdeb469 

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

Change-Id: Idf9dd0c5e058cd33e85db82dee49be8c6f46d5f7
parents 3ca3aefb cbdeb469

DnsResolver.cpp

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

bool resolv_init(const ResolverNetdCallbacks* callbacks) {

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

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

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

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

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

    resolv_set_log_severity(android::base::WARNING);

    const bool isDebug = isUserDebugBuild();

    doh_init_logger(DOH_LOG_LEVEL_WARN);

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

    doh_init_logger(isDebug ? DOH_LOG_LEVEL_DEBUG : DOH_LOG_LEVEL_WARN);

    using android::net::gApiLevel;

    using android::net::gApiLevel;

    gApiLevel = getApiLevel();

    gApiLevel = getApiLevel();

    using android::net::gResNetdCallbacks;

    using android::net::gResNetdCallbacks;

util.h

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

    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() {

inline bool isDoHEnabled() {

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

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

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

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