summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2015-04-24 15:55:40 -0700
committer Mark Salyzyn <salyzyn@google.com> 2015-06-16 07:10:59 -0700
commit2b3db1444ab0bb7c2a2d13febb4fa88aebecf74c (patch)
treed636d92a861cfae9fdbfc05e243a356288a418ce
parentdbc86ad170e2c288f0154a264d12bd6dadf78c45 (diff)
jni: isLoggable calls __android_log_is_loggable
(cherry pick from commit 8685a4569d2bdcb1a7361e3d75f832cf3ba9d4b6) Will inherit additional functionality and cache improvements Bug: 17760225 Change-Id: Iab1816d37cc74343d83629d851a5784d4865ebb4
-rw-r--r--core/jni/android_util_Log.cpp26
1 files changed, 1 insertions, 25 deletions
diff --git a/core/jni/android_util_Log.cpp b/core/jni/android_util_Log.cpp
index 9a80f1d960b2..2b1067bede5d 100644
--- a/core/jni/android_util_Log.cpp
+++ b/core/jni/android_util_Log.cpp
@@ -41,32 +41,8 @@ struct levels_t {
};
static levels_t levels;
-static int toLevel(const char* value)
-{
- switch (value[0]) {
- case 'V': return levels.verbose;
- case 'D': return levels.debug;
- case 'I': return levels.info;
- case 'W': return levels.warn;
- case 'E': return levels.error;
- case 'A': return levels.assert;
- case 'S': return -1; // SUPPRESS
- }
- return levels.info;
-}
-
static jboolean isLoggable(const char* tag, jint level) {
- String8 key;
- key.append(LOG_NAMESPACE);
- key.append(tag);
-
- char buf[PROPERTY_VALUE_MAX];
- if (property_get(key.string(), buf, "") <= 0) {
- buf[0] = '\0';
- }
-
- int logLevel = toLevel(buf);
- return logLevel >= 0 && level >= logLevel;
+ return __android_log_is_loggable(level, tag, ANDROID_LOG_INFO);
}
static jboolean android_util_Log_isLoggable(JNIEnv* env, jobject clazz, jstring tag, jint level)