diff options
| author | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-10 19:18:16 -0600 |
|---|---|---|
| committer | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-12 17:36:06 -0800 |
| commit | 7d2f2d113756c8790860f6ce9743b4d51747a9db (patch) | |
| tree | 5f756095a882207d92da629b5191b53a14212888 | |
| parent | 9d5a01b91dcdb717fb74ee0f6b8364f1769d31bf (diff) | |
| download | android_packages_apps_Bluetooth-7d2f2d113756c8790860f6ce9743b4d51747a9db.tar.gz android_packages_apps_Bluetooth-7d2f2d113756c8790860f6ce9743b4d51747a9db.tar.bz2 android_packages_apps_Bluetooth-7d2f2d113756c8790860f6ce9743b4d51747a9db.zip | |
jni: fix merge failure
Change-Id: I49d28a28f1a75737d8d8bf16d4c96a516acbbaf4
| -rw-r--r-- | jni/com_android_bluetooth_a2dp.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/jni/com_android_bluetooth_a2dp.cpp b/jni/com_android_bluetooth_a2dp.cpp index 7be8f538a..deb1861c3 100644 --- a/jni/com_android_bluetooth_a2dp.cpp +++ b/jni/com_android_bluetooth_a2dp.cpp @@ -240,6 +240,11 @@ static void initNative(JNIEnv *env, jobject object, jint maxA2dpConnections, sBluetoothA2dpInterface = NULL; } + if ((mCallbacksObj = env->NewGlobalRef(object)) == NULL) { + ALOGE("Failed to allocate Global Ref for A2DP Callbacks"); + return; + } + if ( (sBluetoothA2dpInterface = (btav_interface_t *) btInf->get_profile_interface(BT_PROFILE_ADVANCED_AUDIO_ID)) == NULL) { ALOGE("Failed to get Bluetooth A2DP Interface"); @@ -252,11 +257,7 @@ static void initNative(JNIEnv *env, jobject object, jint maxA2dpConnections, env->DeleteGlobalRef(mCallbacksObj); mCallbacksObj = NULL; } - - if ((mCallbacksObj = env->NewGlobalRef(object)) == NULL) { - ALOGE("Failed to allocate Global Ref for A2DP Callbacks"); - return; - } + mCallbacksObj = env->NewGlobalRef(object); pthread_mutex_unlock(&mMutex); if ( (status = sBluetoothA2dpInterface->init(&sBluetoothA2dpCallbacks, |