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

Commit ed881341 authored by Marin Shalamanov's avatar Marin Shalamanov
Browse files

Log signatures for failing JNI lookups. 

The JNI helper methods such as GetFieldIDOrDie, GetFieldIDOrDie
mast commonly fail due to wrong signatures. However, currently
the error logs do not show the signatures which makes it hard
to debug. This CL adds the signatures of the failing lookups.

Test: 1. introduce an error in a signature in
         android_view_SurfaceControl.cpp
      2. build and flash a device
      3. inspect logcat

Change-Id: I055dfe761517625b0d541e9660de709d19360efc
parent 98af1591

core/jni/core_jni_helpers.h

+8 −4
Original line number Original line Diff line number Diff line
@@ -47,28 +47,32 @@ static inline jclass FindClassOrDie(JNIEnv* env, const char* class_name) { 
static inline jfieldID GetFieldIDOrDie(JNIEnv* env, jclass clazz, const char* field_name,

static inline jfieldID GetFieldIDOrDie(JNIEnv* env, jclass clazz, const char* field_name,

                                       const char* field_signature) {

                                       const char* field_signature) {

    jfieldID res = env->GetFieldID(clazz, field_name, field_signature);

    jfieldID res = env->GetFieldID(clazz, field_name, field_signature);

    LOG_ALWAYS_FATAL_IF(res == NULL, "Unable to find static field %s", field_name);

    LOG_ALWAYS_FATAL_IF(res == NULL, "Unable to find static field %s with signature %s", field_name,

                        field_signature);

    return res;

    return res;

}

}





static inline jmethodID GetMethodIDOrDie(JNIEnv* env, jclass clazz, const char* method_name,

static inline jmethodID GetMethodIDOrDie(JNIEnv* env, jclass clazz, const char* method_name,

                                         const char* method_signature) {

                                         const char* method_signature) {

    jmethodID res = env->GetMethodID(clazz, method_name, method_signature);

    jmethodID res = env->GetMethodID(clazz, method_name, method_signature);

    LOG_ALWAYS_FATAL_IF(res == NULL, "Unable to find method %s", method_name);

    LOG_ALWAYS_FATAL_IF(res == NULL, "Unable to find method %s with signature %s", method_name,

                        method_signature);

    return res;

    return res;

}

}





static inline jfieldID GetStaticFieldIDOrDie(JNIEnv* env, jclass clazz, const char* field_name,

static inline jfieldID GetStaticFieldIDOrDie(JNIEnv* env, jclass clazz, const char* field_name,

                                             const char* field_signature) {

                                             const char* field_signature) {

    jfieldID res = env->GetStaticFieldID(clazz, field_name, field_signature);

    jfieldID res = env->GetStaticFieldID(clazz, field_name, field_signature);

    LOG_ALWAYS_FATAL_IF(res == NULL, "Unable to find static field %s", field_name);

    LOG_ALWAYS_FATAL_IF(res == NULL, "Unable to find static field %s with signature %s", field_name,

                        field_signature);

    return res;

    return res;

}

}





static inline jmethodID GetStaticMethodIDOrDie(JNIEnv* env, jclass clazz, const char* method_name,

static inline jmethodID GetStaticMethodIDOrDie(JNIEnv* env, jclass clazz, const char* method_name,

                                               const char* method_signature) {

                                               const char* method_signature) {

    jmethodID res = env->GetStaticMethodID(clazz, method_name, method_signature);

    jmethodID res = env->GetStaticMethodID(clazz, method_name, method_signature);

    LOG_ALWAYS_FATAL_IF(res == NULL, "Unable to find static method %s", method_name);

    LOG_ALWAYS_FATAL_IF(res == NULL, "Unable to find static method %s with signature %s",

                        method_name, method_signature);

    return res;

    return res;

}

}