Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: If6b6f432788557a109b10fb255c6ee49705b8bfd
Change-Id: Ie620cd6e1d01ba9b1c3b8f9497b9773ba342dcdc

1 files changed, 1 insertions, 24 deletions

diff --git a/logd/LogStatistics.cpp b/logd/LogStatistics.cpp
index 52954958..173b7330 100644
--- a/logd/LogStatistics.cpp
+++ b/logd/LogStatistics.cpp
@@ -111,21 +111,14 @@ char* pidToName(pid_t pid) {
 }
 
 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::Add(LogStatisticsElement element) {
 }
 
 void LogStatistics::Subtract(LogStatisticsElement element) {
-    if (!enable) {
-        return;
-    }
-
     auto lock = std::lock_guard{lock_};
 
     if (!track_total_size_) {
@@ -242,10 +231,6 @@ const char* LogStatistics::UidToName(uid_t uid) const {
 
 // 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::FormatTable(const LogHashtable<TKey, TEntry>& table,
 }
 
 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::ReportInteresting() const {
 }
 
 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;