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

Commit e8eb26df authored by Luke Huang's avatar Luke Huang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ie7c207f5d0b93b6d9c52c45ad1d3d62e4ca0bd53
parents 0cd321d9 cfe13082

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

}