commit a891d08dad829c9aacd29bd2c3b36debe3fc1cc3
author Mark Salyzyn <salyzyn@google.com> Fri Feb 27 18:46:04 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 27 18:46:04 2015 +0000
tree d8b5dcb949d76dd8c2fd67ecac9df135327681d9
parent 8cba382f04e4ead4a6b8c4a74216ddb383e8db91
parent ca50cd2114f2c509ae2d1d06468e61f3cfc0b280

Merge "jni: Add paranoia regarding android_logger_list_read"

core/jni/android_util_EventLog.cpp

diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp
index 6c95b8a..5cb8b2e 100644
--- a/core/jni/android_util_EventLog.cpp
+++ b/core/jni/android_util_EventLog.cpp
@@ -188,6 +188,10 @@
             break;
         }
 
+        if (log_msg.id() != LOG_ID_EVENTS) {
+            continue;
+        }
+
         int32_t tag = * (int32_t *) log_msg.msg();
 
         int found = 0;