diff options
author | Andreas Gampe <agampe@google.com> | 2014-11-20 22:02:20 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-11-21 10:15:08 -0800 |
commit | ed6b9dff563c5e22f040ff37e12c0d771e0478ae (patch) | |
tree | de1338ef208f874dd3c92a255a0c98c4d6f21cf3 /core/jni/android_media_JetPlayer.cpp | |
parent | f926d71b8ef2790da067550144860705c1a61fe5 (diff) | |
download | frameworks_base-ed6b9dff563c5e22f040ff37e12c0d771e0478ae.zip frameworks_base-ed6b9dff563c5e22f040ff37e12c0d771e0478ae.tar.gz frameworks_base-ed6b9dff563c5e22f040ff37e12c0d771e0478ae.tar.bz2 |
Frameworks/base: Consistency in core/jni
Make consistent use of core_jni_helpers for registration.
Translate some #ifdefs into const bools.
Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
Diffstat (limited to 'core/jni/android_media_JetPlayer.cpp')
-rw-r--r-- | core/jni/android_media_JetPlayer.cpp | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/core/jni/android_media_JetPlayer.cpp b/core/jni/android_media_JetPlayer.cpp index 69f5711..d441f10 100644 --- a/core/jni/android_media_JetPlayer.cpp +++ b/core/jni/android_media_JetPlayer.cpp @@ -24,7 +24,7 @@ #include <jni.h> #include <JNIHelp.h> -#include <android_runtime/AndroidRuntime.h> +#include "core_jni_helpers.h" #include <utils/Log.h> #include <media/JetPlayer.h> @@ -517,36 +517,22 @@ static JNINativeMethod gMethods[] = { int register_android_media_JetPlayer(JNIEnv *env) { - jclass jetPlayerClass = NULL; javaJetPlayerFields.jetClass = NULL; javaJetPlayerFields.postNativeEventInJava = NULL; javaJetPlayerFields.nativePlayerInJavaObj = NULL; // Get the JetPlayer java class - jetPlayerClass = env->FindClass(kClassPathName); - if (jetPlayerClass == NULL) { - ALOGE("Can't find %s", kClassPathName); - return -1; - } - javaJetPlayerFields.jetClass = (jclass)env->NewGlobalRef(jetPlayerClass); + jclass jetPlayerClass = FindClassOrDie(env, kClassPathName); + javaJetPlayerFields.jetClass = MakeGlobalRefOrDie(env, jetPlayerClass); // Get the mNativePlayerInJavaObj variable field - javaJetPlayerFields.nativePlayerInJavaObj = env->GetFieldID( - jetPlayerClass, - JAVA_NATIVEJETPLAYERINJAVAOBJ_FIELD_NAME, "J"); - if (javaJetPlayerFields.nativePlayerInJavaObj == NULL) { - ALOGE("Can't find JetPlayer.%s", JAVA_NATIVEJETPLAYERINJAVAOBJ_FIELD_NAME); - return -1; - } + javaJetPlayerFields.nativePlayerInJavaObj = GetFieldIDOrDie(env, + jetPlayerClass, JAVA_NATIVEJETPLAYERINJAVAOBJ_FIELD_NAME, "J"); // Get the callback to post events from this native code to Java - javaJetPlayerFields.postNativeEventInJava = env->GetStaticMethodID(javaJetPlayerFields.jetClass, - JAVA_NATIVEJETPOSTEVENT_CALLBACK_NAME, "(Ljava/lang/Object;III)V"); - if (javaJetPlayerFields.postNativeEventInJava == NULL) { - ALOGE("Can't find Jet.%s", JAVA_NATIVEJETPOSTEVENT_CALLBACK_NAME); - return -1; - } + javaJetPlayerFields.postNativeEventInJava = GetStaticMethodIDOrDie(env, + javaJetPlayerFields.jetClass, JAVA_NATIVEJETPOSTEVENT_CALLBACK_NAME, + "(Ljava/lang/Object;III)V"); - return AndroidRuntime::registerNativeMethods(env, - kClassPathName, gMethods, NELEM(gMethods)); + return RegisterMethodsOrDie(env, kClassPathName, gMethods, NELEM(gMethods)); } |