commit cfbe9b5f431a20214906d5a75bdf4731e131e597
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 19 01:54:18 2022 +0000
committer Copybara-Service <copybara-worker@google.com> Tue Nov 22 10:31:25 2022 -0800
tree 173d651ef80023f9f195ea3f374669d36a7cdac1
parent df14918176129ad9f4b4801ecbc4534877fab00d

Merge "Remove out-of-enum-range branch (LOG_ID_ANY)."

GitOrigin-RevId: acb8e0abc6d459f9881b1d0e541c01e5df369911
Change-Id: I0f263b441932e91503fed4fea028f45d2986344c

liblog/include/private/android_logger.h

diff --git a/liblog/include/private/android_logger.h b/liblog/include/private/android_logger.h
index 166f387..d414b07 100644
--- a/liblog/include/private/android_logger.h
+++ b/liblog/include/private/android_logger.h
@@ -126,7 +126,6 @@
                                       const char* filename, const char* buf,
                                       size_t len);
 
-#define LOG_ID_ANY ((log_id_t)-1)
 #define ANDROID_LOG_ANY ANDROID_LOG_UNKNOWN
 
 /* first 5 arguments match __android_log_msg_file_write, a cast is safe */

liblog/pmsg_reader.cpp

diff --git a/liblog/pmsg_reader.cpp b/liblog/pmsg_reader.cpp
index cf89366..4d603db 100644
--- a/liblog/pmsg_reader.cpp
+++ b/liblog/pmsg_reader.cpp
@@ -185,9 +185,7 @@
   struct logger_list logger_list = {
       .mode = static_cast<int>(ANDROID_LOG_PSTORE | ANDROID_LOG_NONBLOCK),
       .log_mask = (unsigned)-1};
-  if (logId != LOG_ID_ANY) {
-    logger_list.log_mask = (1 << logId);
-  }
+  logger_list.log_mask = (1 << logId);
   logger_list.log_mask &= ~((1 << LOG_ID_KERNEL) | (1 << LOG_ID_EVENTS) | (1 << LOG_ID_SECURITY));
   if (!logger_list.log_mask) {
     return -EINVAL;