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

Commit 13df50a3 authored by Luke Huang's avatar Luke Huang
Browse files

Revert "Enable DnsResolver log in userdebug build" 

This reverts commit bcb4d759.

Reason for revert: time to release module

Change-Id: I1c7495135a6a0985e2bed718974830dfcb1ab699
Merged-In: Id3060cf0ccd699289a2dd7dcdac48f45eb5c589e
parent af2f70b3

DnsResolver.cpp

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

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

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

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

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

    resolv_set_log_severity(android::base::WARNING);

    using android::net::gApiLevel;

    gApiLevel = getApiLevel();

    using android::net::gResNetdCallbacks;

util.h

+0 −5
Original line number Diff line number Diff line
@@ -47,8 +47,3 @@ 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");

}