summaryrefslogtreecommitdiffstats
path: root/logcat
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-05-14 12:37:22 -0700
committerMark Salyzyn <salyzyn@google.com>2014-05-15 08:50:50 -0700
commit989980c55d9a11766b8698a97ce5eef3d8cfa286 (patch)
tree59a9ae76f160a724e9ca64c15cf768e736da6edf /logcat
parent75a8eeb1ecf9f748b1d53e5ff3a5e138a0cdbebd (diff)
downloadsystem_core-989980c55d9a11766b8698a97ce5eef3d8cfa286.zip
system_core-989980c55d9a11766b8698a97ce5eef3d8cfa286.tar.gz
system_core-989980c55d9a11766b8698a97ce5eef3d8cfa286.tar.bz2
logd: logcat: debuggerd: auditd logs to events
- auditd switch to recording logs to events log id - logcat add events as one of the default logs - debuggerd collect events log as well. ToDo: debuggerd & bugreport collect intermixed logs. BUG: 14626551 Change-Id: I958f0e729b7596748be57488a38824db5645be7b
Diffstat (limited to 'logcat')
-rw-r--r--logcat/logcat.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index db4fddd..ed2c241 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -623,19 +623,20 @@ int main(int argc, char **argv)
}
if (!devices) {
- devices = new log_device_t("main", false, 'm');
+ dev = devices = new log_device_t("main", false, 'm');
android::g_devCount = 1;
if (android_name_to_log_id("system") == LOG_ID_SYSTEM) {
- devices->next = new log_device_t("system", false, 's');
+ dev = dev->next = new log_device_t("system", false, 's');
android::g_devCount++;
}
if (android_name_to_log_id("crash") == LOG_ID_CRASH) {
- if (devices->next) {
- devices->next->next = new log_device_t("crash", false, 'c');
- } else {
- devices->next = new log_device_t("crash", false, 'c');
- }
+ dev = dev->next = new log_device_t("crash", false, 'c');
+ android::g_devCount++;
+ }
+ if (android_name_to_log_id("events") == LOG_ID_EVENTS) {
+ dev = dev->next = new log_device_t("events", true, 'e');
android::g_devCount++;
+ needBinary = true;
}
}