ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "logcat: use liblog to determine -b all list"

Browse source
This commit is contained in:
Mark Salyzyn 2014-12-05 20:14:42 +00:00 • committed by Gerrit Code Review
commit e0a5ab5d56
1 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
logcat/logcat.cpp
View file

@ -455,36 +455,31 @@ int main(int argc, char **argv)
delete dev; delete dev;
} }
dev = devices = new log_device_t("main", false, 'm'); devices = dev = NULL;
android::g_devCount = 1; android::g_devCount = 0;
if (android_name_to_log_id("system") == LOG_ID_SYSTEM) { needBinary = false;
dev->next = new log_device_t("system", false, 's'); for(int i = LOG_ID_MIN; i < LOG_ID_MAX; ++i) {
if (dev->next) { const char *name = android_log_id_to_name((log_id_t)i);
dev = dev->next; log_id_t log_id = android_name_to_log_id(name);
android::g_devCount++;
if (log_id != (log_id_t)i) {
continue;
} }
}
if (android_name_to_log_id("radio") == LOG_ID_RADIO) { bool binary = strcmp(name, "events") == 0;
dev->next = new log_device_t("radio", false, 'r'); log_device_t* d = new log_device_t(name, binary, *name);
if (dev->next) {
dev = dev->next; if (dev) {
android::g_devCount++; dev->next = d;
dev = d;
} else {
devices = dev = d;
} }
} android::g_devCount++;
if (android_name_to_log_id("events") == LOG_ID_EVENTS) { if (binary) {
dev->next = new log_device_t("events", true, 'e');
if (dev->next) {
dev = dev->next;
android::g_devCount++;
needBinary = true; needBinary = true;
} }
} }
if (android_name_to_log_id("crash") == LOG_ID_CRASH) {
dev->next = new log_device_t("crash", false, 'c');
if (dev->next) {
android::g_devCount++;
}
}
break; break;
} }