am b8da6942: am b51546f4: Merge "liblog: Add kernel log id"

* commit 'b8da694214515228c487d45f7edc210e77e257b5':
  liblog: Add kernel log id
This commit is contained in:
Mark Salyzyn 2015-05-11 16:28:31 +00:00 committed by Android Git Automerger
commit 977922252f
4 changed files with 6 additions and 2 deletions

View File

@ -598,6 +598,7 @@ typedef enum log_id {
LOG_ID_EVENTS = 2,
LOG_ID_SYSTEM = 3,
LOG_ID_CRASH = 4,
LOG_ID_KERNEL = 5,
#endif
LOG_ID_MAX

View File

@ -208,6 +208,7 @@ static const char *LOG_NAME[LOG_ID_MAX] = {
[LOG_ID_EVENTS] = "events",
[LOG_ID_SYSTEM] = "system",
[LOG_ID_CRASH] = "crash",
[LOG_ID_KERNEL] = "kernel",
};
const char *android_log_id_to_name(log_id_t log_id)

View File

@ -62,7 +62,8 @@ static const char *LOG_NAME[LOG_ID_MAX] = {
[LOG_ID_RADIO] = "radio",
[LOG_ID_EVENTS] = "events",
[LOG_ID_SYSTEM] = "system",
[LOG_ID_CRASH] = "crash"
[LOG_ID_CRASH] = "crash",
[LOG_ID_KERNEL] = "kernel",
};
const char *android_log_id_to_name(log_id_t log_id)

View File

@ -310,7 +310,8 @@ static const char *LOG_NAME[LOG_ID_MAX] = {
[LOG_ID_RADIO] = "radio",
[LOG_ID_EVENTS] = "events",
[LOG_ID_SYSTEM] = "system",
[LOG_ID_CRASH] = "crash"
[LOG_ID_CRASH] = "crash",
[LOG_ID_KERNEL] = "kernel",
};
const char *android_log_id_to_name(log_id_t log_id)