commit 447075c5711f157518ab40cbac4a61835054e6c7
author Nathan Harold <nharold@google.com> Tue Aug 23 15:23:33 2016 -0700
committer Nathan Harold <nharold@google.com> Tue Aug 23 15:23:33 2016 -0700
tree 4cc1a6ddfe2ee4d0ae7e634c208f3f8fc3f40b2a
parent 3fffb5a79db220b2a870a73d70194e6cb7bc5d6a

Allocate CallbacksObj Before Initializing A2DP JNI Interface

Bug: 31016704
Change-Id: If3dd4fdbc92e1420bc60910c39771aa549ac5dab

jni/com_android_bluetooth_a2dp.cpp

diff --git a/jni/com_android_bluetooth_a2dp.cpp b/jni/com_android_bluetooth_a2dp.cpp
index b621ce4..2b4cb56 100644
--- a/jni/com_android_bluetooth_a2dp.cpp
+++ b/jni/com_android_bluetooth_a2dp.cpp
@@ -131,6 +131,11 @@
          mCallbacksObj = 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");
@@ -142,8 +147,6 @@
         sBluetoothA2dpInterface = NULL;
         return;
     }
-
-    mCallbacksObj = env->NewGlobalRef(object);
 }
 
 static void cleanupNative(JNIEnv *env, jobject object) {