diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-02-27 19:10:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-27 19:10:11 +0000 |
| commit | 07a65f444a88a8acf727700f5e23c3a537466e6a (patch) | |
| tree | 40bd41caff637dc31cba1c8dd392678745ecf63b /core | |
| parent | cb147e53e4367ab60384d3452ae7c9974cf0d8f8 (diff) | |
| parent | bbef7cf3bbf778dd8ae3b91b140bf4542241093b (diff) | |
| download | frameworks_base-07a65f444a88a8acf727700f5e23c3a537466e6a.zip frameworks_base-07a65f444a88a8acf727700f5e23c3a537466e6a.tar.gz frameworks_base-07a65f444a88a8acf727700f5e23c3a537466e6a.tar.bz2 | |
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
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_util_EventLog.cpp | 4 |
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; |