Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4b44d3b authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android (Google) Code Review
Browse files

Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev

parents 7ecd40c1 c9668a18

core/java/android/util/Log.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

core/jni/android_util_Log.cpp

+1 −10
Original line number Diff line number Diff line
@@ -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;