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

Merge "jni: isLoggable: adapt to removal of property name size limit"

Browse Source
This commit is contained in:
Mark Salyzyn
2017-04-11 23:13:06 +00:00
committed by Gerrit Code Review
parent f954f2d5cc 8143fa57ad
commit cf39eea407
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/util/Log.java
View File

@@ -212,7 +212,9 @@ public final class Log {
* @param tag The tag to check. * @param tag The tag to check.
* @param level The level to check. * @param level The level to check.
* @return Whether or not that this is allowed to be logged. * @return Whether or not that this is allowed to be logged.
* @throws IllegalArgumentException is thrown if the tag.length() > 23. * @throws IllegalArgumentException is thrown if the tag.length() > 23
* for Nougat (7.0) releases (API <= 23) and prior, there is no
* tag limit of concern after this API level.
*/ */
public static native boolean isLoggable(String tag, int level); public static native boolean isLoggable(String tag, int level);

11
core/jni/android_util_Log.cpp
View File

@@ -58,16 +58,7 @@ static jboolean android_util_Log_isLoggable(JNIEnv* env, jobject clazz, jstring
return false; return false;
} }
jboolean result = false; jboolean result = isLoggable(chars, level);
if ((strlen(chars)+sizeof(LOG_NAMESPACE)) > PROPERTY_KEY_MAX) {
char buf2[200];
snprintf(buf2, sizeof(buf2), "Log tag \"%s\" exceeds limit of %zu characters\n",
chars, PROPERTY_KEY_MAX - sizeof(LOG_NAMESPACE));
jniThrowException(env, "java/lang/IllegalArgumentException", buf2);
} else {
result = isLoggable(chars, level);
}
env->ReleaseStringUTFChars(tag, chars); env->ReleaseStringUTFChars(tag, chars);
return result; return result;