Merge "Better fix for unregistered JNI method" (1097fa88) · Commits · e / os / android_frameworks_base

core/jni/android_media_AudioTrack.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -1140,6 +1140,9 @@ bool android_media_getIntConstantFromClass(JNIEnv* pEnv, jclass theClass, const
		// ----------------------------------------------------------------------------
		int register_android_media_AudioTrack(JNIEnv *env)
		{
		// must be first
		int res = RegisterMethodsOrDie(env, kClassPathName, gMethods, NELEM(gMethods));

		javaAudioTrackFields.nativeTrackInJavaObj = NULL;
		javaAudioTrackFields.postNativeEventInJava = NULL;

		@@ -1178,7 +1181,7 @@ int register_android_media_AudioTrack(JNIEnv *env)
		// initialize PlaybackParams field info
		gPlaybackParamsFields.init(env);

		return RegisterMethodsOrDie(env, kClassPathName, gMethods, NELEM(gMethods));
		return res;
		}