commit 67c6c21b4d012290f5d1957064e322be2244f8fb
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 24 11:14:54 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 24 11:14:54 2022 +0000
tree f9c57a2820ce4dbede5fbb2a047b364b88f3da0c
parent 990174cc78c2f1354e116f3c999f565526e1d1a8
parent 637d771880a98d2feb5a9d1839ad59d048722ebb

Merge "Disable DnsResolver log in userdebug build" am: 637d771880

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

Change-Id: Ib78a775224530b48765e9ed9e07d31dfb9112319

DnsResolver.cpp

diff --git a/DnsResolver.cpp b/DnsResolver.cpp
index 06ce214..59ce03a 100644
--- a/DnsResolver.cpp
+++ b/DnsResolver.cpp
@@ -31,10 +31,8 @@
 bool resolv_init(const ResolverNetdCallbacks* callbacks) {
     android::base::InitLogging(/*argv=*/nullptr);
     LOG(INFO) << __func__ << ": Initializing resolver";
-    // TODO(b/170539625): restore log level to WARNING after clarifying flaky tests.
-    const bool isDebug = isUserDebugBuild();
-    resolv_set_log_severity(isDebug ? android::base::DEBUG : android::base::WARNING);
-    doh_init_logger(isDebug ? DOH_LOG_LEVEL_DEBUG : DOH_LOG_LEVEL_WARN);
+    resolv_set_log_severity(android::base::WARNING);
+    doh_init_logger(DOH_LOG_LEVEL_WARN);
     using android::net::gApiLevel;
     gApiLevel = getApiLevel();
     using android::net::gResNetdCallbacks;

util.h

diff --git a/util.h b/util.h
index 69665a9..c30c161 100644
--- a/util.h
+++ b/util.h
@@ -55,11 +55,6 @@
     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() {
     static bool isAtLeastT = android::modules::sdklevel::IsAtLeastT();
     return android::net::Experiments::getInstance()->getFlag("doh", isAtLeastT ? 1 : 0);