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

Commit 7b2978e7 authored by Luke Huang's avatar Luke Huang
Browse files

Enable DnsResolver log in userdebug build 

To debug flaky test, set DnsResolver default log level to debug in
usesrdebug build.

Test: atest
Bug: 174783023
Change-Id: I6ee298d2951cb3df9d0ae24aee61caba0c20119c
parent d47d8125

DnsResolver.cpp

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,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");

}