From 8143fa57adfbb4a5cc253e4ef68663525a8f81eb Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Fri, 7 Apr 2017 11:26:26 -0700 Subject: jni: isLoggable: adapt to removal of property name size limit There is no longer a name size limit to the properties, remove illegalArgumentException if tag length is too large. Test: build Bug: 36696208 Change-Id: I4b4329c8c951082ed0d777cdd70ee3e773bed16c --- core/java/android/util/Log.java | 4 +++- core/jni/android_util_Log.cpp | 11 +---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/core/java/android/util/Log.java b/core/java/android/util/Log.java index 5bc6c9480025..d857bf712bfe 100644 --- a/core/java/android/util/Log.java +++ b/core/java/android/util/Log.java @@ -212,7 +212,9 @@ public final class Log { * @param tag The tag to check. * @param level The level to check. * @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); diff --git a/core/jni/android_util_Log.cpp b/core/jni/android_util_Log.cpp index 20dfe7809728..56505afc78b2 100644 --- a/core/jni/android_util_Log.cpp +++ b/core/jni/android_util_Log.cpp @@ -58,16 +58,7 @@ static jboolean android_util_Log_isLoggable(JNIEnv* env, jobject clazz, jstring return false; } - jboolean result = false; - 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); - } + jboolean result = isLoggable(chars, level); env->ReleaseStringUTFChars(tag, chars); return result; -- cgit v1.2.3-59-g8ed1b