summaryrefslogtreecommitdiffstats
path: root/logd
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 /logd
parentc58f49bf1bee57e4d1a16b9f9df9441b4ab7e01a (diff)
parent9bfd9f558b116e208aef7bdeef887ca37fcd2007 (diff)
downloadsystem_core-10f4044341e95ff4504c3e8b30e26ad528ea2d4c.tar.gz
system_core-10f4044341e95ff4504c3e8b30e26ad528ea2d4c.tar.bz2
system_core-10f4044341e95ff4504c3e8b30e26ad528ea2d4c.zip
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
am: 9bfd9f558b Change-Id: Ief7fcc4f7dd8086186b38c091fed626560ca7215
Diffstat (limited to 'logd')
-rw-r--r--logd/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/logd/main.cpp b/logd/main.cpp
index 7550c41a5..c3343d785 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -311,7 +311,7 @@ const char *android::tagToName(size_t *len, uint32_t tag) {
if (!map) {
sem_wait(&sem_name);
if (!map) {
- map = android_openEventTagMap(EVENT_TAG_MAP_FILE);
+ map = android_openEventTagMap(NULL);
}
sem_post(&sem_name);
if (!map) {