commit 07a65f444a88a8acf727700f5e23c3a537466e6a
author Mark Salyzyn <salyzyn@google.com> Fri Feb 27 19:10:11 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 27 19:10:11 2015 +0000
tree 40bd41caff637dc31cba1c8dd392678745ecf63b
parent cb147e53e4367ab60384d3452ae7c9974cf0d8f8
parent bbef7cf3bbf778dd8ae3b91b140bf4542241093b

am bbef7cf3: am 012c3b72: am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"

* commit 'bbef7cf3bbf778dd8ae3b91b140bf4542241093b':
  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;