diff options
author | Andreas Gampe <agampe@google.com> | 2014-11-18 17:29:46 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-11-19 09:21:12 -0800 |
commit | 987f79f60bb1f0a4bcd3ef22e57301c743f0b94f (patch) | |
tree | 0ca0916dade98039096346937279ee3587353ede /core/jni/android_view_InputChannel.cpp | |
parent | 8462913d0c19973901a861749b4abbaacdf4b477 (diff) | |
download | frameworks_base-987f79f60bb1f0a4bcd3ef22e57301c743f0b94f.zip frameworks_base-987f79f60bb1f0a4bcd3ef22e57301c743f0b94f.tar.gz frameworks_base-987f79f60bb1f0a4bcd3ef22e57301c743f0b94f.tar.bz2 |
Frameworks/base: Replace LOG_FATAL_IF in core/jni
Do not use LOG_FATAL_IF in JNI setup. This is one-time on startup
and important enough to always check.
Add a header with common helper definitions. Move to inlined functions
instead of macros to clean up the code.
Change-Id: Ib12d0eed61b110c45d748e80ec36c563e9dec7e5
Diffstat (limited to 'core/jni/android_view_InputChannel.cpp')
-rw-r--r-- | core/jni/android_view_InputChannel.cpp | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/core/jni/android_view_InputChannel.cpp b/core/jni/android_view_InputChannel.cpp index b64b7c6..4b42ab5 100644 --- a/core/jni/android_view_InputChannel.cpp +++ b/core/jni/android_view_InputChannel.cpp @@ -26,6 +26,8 @@ #include "android_os_Parcel.h" #include "android_util_Binder.h" +#include "core_jni_helpers.h" + namespace android { // ---------------------------------------------------------------------------- @@ -275,34 +277,19 @@ static JNINativeMethod gInputChannelMethods[] = { (void*)android_view_InputChannel_nativeDup }, }; -#define FIND_CLASS(var, className) \ - var = env->FindClass(className); \ - LOG_FATAL_IF(! var, "Unable to find class " className); \ - var = jclass(env->NewGlobalRef(var)); - -#define GET_METHOD_ID(var, clazz, methodName, methodDescriptor) \ - var = env->GetMethodID(clazz, methodName, methodDescriptor); \ - LOG_FATAL_IF(! var, "Unable to find method " methodName); - -#define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \ - var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! var, "Unable to find field " fieldName); - int register_android_view_InputChannel(JNIEnv* env) { - int res = jniRegisterNativeMethods(env, "android/view/InputChannel", - gInputChannelMethods, NELEM(gInputChannelMethods)); - LOG_FATAL_IF(res < 0, "Unable to register native methods."); - (void)res; + int res = RegisterMethodsOrDie(env, "android/view/InputChannel", gInputChannelMethods, + NELEM(gInputChannelMethods)); + + jclass clazz = FindClassOrDie(env, "android/view/InputChannel"); + gInputChannelClassInfo.clazz = MakeGlobalRefOrDie(env, clazz); - FIND_CLASS(gInputChannelClassInfo.clazz, "android/view/InputChannel"); + gInputChannelClassInfo.mPtr = GetFieldIDOrDie(env, gInputChannelClassInfo.clazz, "mPtr", "J"); - GET_FIELD_ID(gInputChannelClassInfo.mPtr, gInputChannelClassInfo.clazz, - "mPtr", "J"); - - GET_METHOD_ID(gInputChannelClassInfo.ctor, gInputChannelClassInfo.clazz, - "<init>", "()V"); + gInputChannelClassInfo.ctor = GetMethodIDOrDie(env, gInputChannelClassInfo.clazz, "<init>", + "()V"); - return 0; + return res; } } // namespace android |