summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-02-27 18:46:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-27 18:46:04 +0000
commita891d08dad829c9aacd29bd2c3b36debe3fc1cc3 (patch)
treed8b5dcb949d76dd8c2fd67ecac9df135327681d9
parent8cba382f04e4ead4a6b8c4a74216ddb383e8db91 (diff)
parentca50cd2114f2c509ae2d1d06468e61f3cfc0b280 (diff)
downloadframeworks_base-a891d08dad829c9aacd29bd2c3b36debe3fc1cc3.zip
frameworks_base-a891d08dad829c9aacd29bd2c3b36debe3fc1cc3.tar.gz
frameworks_base-a891d08dad829c9aacd29bd2c3b36debe3fc1cc3.tar.bz2
Merge "jni: Add paranoia regarding android_logger_list_read"
-rw-r--r--core/jni/android_util_EventLog.cpp4
1 files changed, 4 insertions, 0 deletions
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 @@ static void android_util_EventLog_readEvents(JNIEnv* env, jobject clazz UNUSED,
break;
}
+ if (log_msg.id() != LOG_ID_EVENTS) {
+ continue;
+ }
+
int32_t tag = * (int32_t *) log_msg.msg();
int found = 0;