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

Commit cfe13082 authored by Luke Huang's avatar Luke Huang Committed by Android (Google) Code Review
Browse files

Merge "Enable DnsResolver log in userdebug build" into mainline-prod

parents ab135cae bcb4d759

DnsResolver.cpp

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ bool resolv_init(const ResolverNetdCallbacks* callbacks) { 
    android::base::InitLogging(/*argv=*/nullptr);

    android::base::SetDefaultTag("libnetd_resolv");

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

    resolv_set_log_severity(android::base::WARNING);

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

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

    using android::net::gApiLevel;

    gApiLevel = getApiLevel();

    using android::net::gResNetdCallbacks;

util.h

+5 −0
Original line number Diff line number Diff line
@@ -47,3 +47,8 @@ inline uint64_t getApiLevel() { 
            android::base::GetUintProperty<uint64_t>("ro.product.first_api_level", 0);

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

}