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

Commit c22d1184 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix errors in LOG_FATAL_IF arguments." 

am: 78755a8c

Change-Id: I8a75a52970ea8bda0ba2ae71dd82845b0bad7333
parents e7a5d3c1 78755a8c

media/jni/android_media_MediaDrm.cpp

+8 −8
Original line number Diff line number Diff line
@@ -43,27 +43,27 @@ namespace android { 


#define FIND_CLASS(var, className) \

    var = env->FindClass(className); \

    LOG_FATAL_IF(! (var), "Unable to find class " className);

    LOG_FATAL_IF(! (var), "Unable to find class %s", className);



#define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \

    var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \

    LOG_FATAL_IF(! (var), "Unable to find field " fieldName);

    LOG_FATAL_IF(! (var), "Unable to find field %s", fieldName);



#define GET_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \

    var = env->GetMethodID(clazz, fieldName, fieldDescriptor); \

    LOG_FATAL_IF(! (var), "Unable to find method " fieldName);

    LOG_FATAL_IF(! (var), "Unable to find method %s", fieldName);



#define GET_STATIC_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \

    var = env->GetStaticFieldID(clazz, fieldName, fieldDescriptor); \

    LOG_FATAL_IF(! (var), "Unable to find field " fieldName);

    LOG_FATAL_IF(! (var), "Unable to find field %s", fieldName);



#define GET_STATIC_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \

    var = env->GetStaticMethodID(clazz, fieldName, fieldDescriptor); \

    LOG_FATAL_IF(! (var), "Unable to find static method " fieldName);

    LOG_FATAL_IF(! (var), "Unable to find static method %s", fieldName);



#define GET_STATIC_OBJECT_FIELD(var, clazz, fieldName) \

    var = env->GetStaticObjectField(clazz, fieldName); \

    LOG_FATAL_IF(! (var), "Unable to find static object field " fieldName);

#define GET_STATIC_OBJECT_FIELD(var, clazz, fieldId) \

    var = env->GetStaticObjectField(clazz, fieldId); \

    LOG_FATAL_IF(! (var), "Unable to find static object field %p", fieldId);





struct RequestFields {