summaryrefslogtreecommitdiffstats
path: root/logcat
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2016-11-29 19:46:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-29 19:46:50 +0000
commit10f4044341e95ff4504c3e8b30e26ad528ea2d4c (patch)
tree48549f028ecc086e7a2b5a0b209789042896d6a2 /logcat
parentc58f49bf1bee57e4d1a16b9f9df9441b4ab7e01a (diff)
parent9bfd9f558b116e208aef7bdeef887ca37fcd2007 (diff)
downloadcore-10f4044341e95ff4504c3e8b30e26ad528ea2d4c.tar.gz
core-10f4044341e95ff4504c3e8b30e26ad528ea2d4c.tar.bz2
core-10f4044341e95ff4504c3e8b30e26ad528ea2d4c.zip
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
am: 9bfd9f558b Change-Id: Ief7fcc4f7dd8086186b38c091fed626560ca7215
Diffstat (limited to 'logcat')
-rw-r--r--logcat/logcat.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 41f228009..94b8691a3 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -177,7 +177,7 @@ static void processBuffer(log_device_t* dev, struct log_msg *buf)
static EventTagMap *eventTagMap = NULL;
if (!eventTagMap && !hasOpenedEventTagMap) {
- eventTagMap = android_openEventTagMap(EVENT_TAG_MAP_FILE);
+ eventTagMap = android_openEventTagMap(NULL);
hasOpenedEventTagMap = true;
}
err = android_log_processBinaryLogBuffer(&buf->entry_v1, &entry,