diff options
| author | 2018-08-27 10:51:59 -0700 | |
|---|---|---|
| committer | 2018-08-27 10:51:59 -0700 | |
| commit | c22d1184d4657223a8e3ebdfd7f5e9cf03df0278 (patch) | |
| tree | 2941cf55fc4c35a963d3a716510f25b82de16606 | |
| parent | e7a5d3c143be275aa17e52f6b96ca1b0129cd0ec (diff) | |
| parent | 78755a8c97ca9360199ca80560f08c66ee5dbf52 (diff) | |
Merge "Fix errors in LOG_FATAL_IF arguments."
am: 78755a8c97
Change-Id: I8a75a52970ea8bda0ba2ae71dd82845b0bad7333
| -rw-r--r-- | media/jni/android_media_MediaDrm.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 54541f02f575..7cf8828c0623 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -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 { |