[automerger skipped] Merge Android 14 QPR1 am: 9df860d54c -s ours
am skip reason: Merged-In I3ee8bebc95bb060adf2e2ca16f5d5402cc9a04ce with SHA-1 1a5c1a0ee0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/logging/+/2863582
Change-Id: I6a349329a0b7dc2a411655e70cc9bbc3c3c77353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/logd/LogStatistics.h b/logd/LogStatistics.h
index 4073159..5b9beab 100644
--- a/logd/LogStatistics.h
+++ b/logd/LogStatistics.h
@@ -494,13 +494,6 @@
// Subtract the total size of the element from statistics.
void Subtract(LogStatisticsElement entry) EXCLUDES(lock_);
- void WorstTwoUids(log_id id, size_t threshold, int* worst, size_t* worst_sizes,
- size_t* second_worst_sizes) const EXCLUDES(lock_);
- void WorstTwoTags(size_t threshold, int* worst, size_t* worst_sizes,
- size_t* second_worst_sizes) const EXCLUDES(lock_);
- void WorstTwoSystemPids(log_id id, size_t worst_uid_sizes, int* worst,
- size_t* second_worst_sizes) const EXCLUDES(lock_);
-
bool ShouldPrune(log_id id, unsigned long max_size, unsigned long* prune_rows) const
EXCLUDES(lock_);
@@ -538,9 +531,6 @@
private:
template <typename TKey, typename TEntry>
- void WorstTwoWithThreshold(const LogHashtable<TKey, TEntry>& table, size_t threshold,
- int* worst, size_t* worst_sizes, size_t* second_worst_sizes) const;
- template <typename TKey, typename TEntry>
std::string FormatTable(const LogHashtable<TKey, TEntry>& table, uid_t uid, pid_t pid,
const std::string& name = std::string(""),
log_id_t id = LOG_ID_MAX) const REQUIRES(lock_);
