Allocate CallbacksObj Before Initializing A2DP JNI Interface (2b55bec0) · Commits · e / os / android_packages_apps_Bluetooth

jni/com_android_bluetooth_a2dp.cpp

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -132,6 +132,11 @@ static void initNative(JNIEnv *env, jobject object) {
	mCallbacksObj = NULL;		mCallbacksObj = NULL;
	}		}

			if ((mCallbacksObj = env->NewGlobalRef(object)) == NULL) {
			ALOGE("Failed to allocate Global Ref for A2DP Callbacks");
			return;
			}

	if ( (sBluetoothA2dpInterface = (btav_interface_t *)		if ( (sBluetoothA2dpInterface = (btav_interface_t *)
	btInf->get_profile_interface(BT_PROFILE_ADVANCED_AUDIO_ID)) == NULL) {		btInf->get_profile_interface(BT_PROFILE_ADVANCED_AUDIO_ID)) == NULL) {
	ALOGE("Failed to get Bluetooth A2DP Interface");		ALOGE("Failed to get Bluetooth A2DP Interface");
	@@ -143,8 +148,6 @@ static void initNative(JNIEnv *env, jobject object) {
	sBluetoothA2dpInterface = NULL;		sBluetoothA2dpInterface = NULL;
	return;		return;
	}		}

	mCallbacksObj = env->NewGlobalRef(object);
	}		}

	static void cleanupNative(JNIEnv *env, jobject object) {		static void cleanupNative(JNIEnv *env, jobject object) {