commit 7016148f19bf49bc0c420e784d95916e0bbe3abc
author Elliott Hughes <enh@google.com> Thu Dec 07 22:04:01 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 07 22:04:01 2023 +0000
tree 73006ee37ba82b0d07be7281dadb880017f72b37
parent 611a570ad88f55a47e2af7861ddaa4b0f4817046
parent 63f3c45d102ca4271181ddc03cbd33619f1f5ea1

Apply the timeout multiplier to all the tests. am: 1ccdf7cd3b am: e7172249d5 am: 63f3c45d10

Original change: https://android-review.googlesource.com/c/platform/system/logging/+/2863766

Change-Id: I54e0dcb28ab860eef627032fdb401696776c3ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

logd/LogStatistics.cpp

diff --git a/logd/LogStatistics.cpp b/logd/LogStatistics.cpp
index 5295495..173b733 100644
--- a/logd/LogStatistics.cpp
+++ b/logd/LogStatistics.cpp
@@ -111,21 +111,14 @@
 }
 
 void LogStatistics::AddTotal(log_id_t log_id, uint16_t size) {
-    if (!enable) {
-        return;
-    }
-
     auto lock = std::lock_guard{lock_};
+
     mSizesTotal[log_id] += size;
     SizesTotal += size;
     ++mElementsTotal[log_id];
 }
 
 void LogStatistics::Add(LogStatisticsElement element) {
-    if (!enable) {
-        return;
-    }
-
     auto lock = std::lock_guard{lock_};
 
     if (!track_total_size_) {
@@ -188,10 +181,6 @@
 }
 
 void LogStatistics::Subtract(LogStatisticsElement element) {
-    if (!enable) {
-        return;
-    }
-
     auto lock = std::lock_guard{lock_};
 
     if (!track_total_size_) {
@@ -242,10 +231,6 @@
 
 // caller must own and free character string
 const char* LogStatistics::UidToNameLocked(uid_t uid) const {
-    if (!enable) {
-        return strdup("logd");
-    }
-
     // Local hard coded favourites
     if (uid == AID_LOGD) {
         return strdup("auditd");
@@ -587,10 +572,6 @@
 }
 
 std::string LogStatistics::ReportInteresting() const {
-    if (!enable) {
-        return std::string("");
-    }
-
     auto lock = std::lock_guard{lock_};
 
     std::vector<std::string> items;
@@ -616,10 +597,6 @@
 }
 
 std::string LogStatistics::Format(uid_t uid, pid_t pid, unsigned int logMask) const {
-    if (!enable) {
-        return std::string("");
-    }
-
     auto lock = std::lock_guard{lock_};
 
     static const uint16_t spaces_total = 19;

logd/main.cpp

diff --git a/logd/main.cpp b/logd/main.cpp
index 83d3d0f..9c270a0 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -108,21 +108,13 @@
 }
 
 // GetBoolProperty that defaults to true if `ro.debuggable == true && ro.config.low_rawm == false`.
-static bool GetBoolPropertyDebuggableSvelteDefault(const std::string& name) {
+static bool GetBoolPropertyEngSvelteDefault(const std::string& name) {
     bool default_value =
             GetBoolProperty("ro.debuggable", false) && !GetBoolProperty("ro.config.low_ram", false);
 
     return GetBoolProperty(name, default_value);
 }
 
-// GetBoolProperty that defaults to true if `ro.build.type == eng && ro.config.low_rawm == false`.
-static bool GetBoolPropertyEngSvelteDefault(const std::string& name) {
-    bool default_value = (GetProperty("ro.build.type", "user").compare("eng") == 0) &&
-                         !GetBoolProperty("ro.config.low_ram", false);
-
-    return GetBoolProperty(name, default_value);
-}
-
 static void readDmesg(LogAudit* al, LogKlog* kl) {
     if (!al && !kl) {
         return;
@@ -227,7 +219,7 @@
     }
 
     int fdPmesg = -1;
-    bool klogd = GetBoolPropertyDebuggableSvelteDefault("ro.logd.kernel");
+    bool klogd = GetBoolPropertyEngSvelteDefault("ro.logd.kernel");
     if (klogd) {
         SetProperty("ro.logd.kernel", "true");
         static const char proc_kmsg[] = "/proc/kmsg";