Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 26a40606: Merge "jni: isLoggable calls __android_log_is_loggable"

Browse Source 
* commit '26a406063732587a667d6c389cfd055a7ceab566':
  jni: isLoggable calls __android_log_is_loggable
This commit is contained in:
Mark Salyzyn
2015-06-16 14:21:40 +00:00
committed by Android Git Automerger
parent e92281716a 26a4060637
commit b17c58dd7f
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/jni/android_util_Log.cpp
View File

@@ -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)