commit 93f548ff8560bdecdc4bdd2f91f7dacda1e6bbc3
author Kausik Sinnaswamy <kausik@broadcom.com> Wed Mar 21 15:14:32 2012 +0530
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 16 21:50:40 2012 -0700
tree f009b5b83b93b111599445976b79378cbb7e81bf
parent 345d21b0575a4b866bfc9ccfde9c654e7b859ac6

Caching callbackEnv in HFP/A2DP JNI results in the ENV going out-of-syn after an disassociate_evt/associate_evt sequence. Removed the caching.

Change-Id: Iebe3d2b3fa632c3332be82291bf32ace62c30ad5

jni/com_android_bluetooth_a2dp.cpp

diff --git a/jni/com_android_bluetooth_a2dp.cpp b/jni/com_android_bluetooth_a2dp.cpp
index 0edf4b4..ebc23a5 100644
--- a/jni/com_android_bluetooth_a2dp.cpp
+++ b/jni/com_android_bluetooth_a2dp.cpp
@@ -20,9 +20,13 @@
 static JNIEnv *sCallbackEnv = NULL;
 
 static bool checkCallbackThread() {
-    if (sCallbackEnv == NULL) {
-        sCallbackEnv = getCallbackEnv();
-    }
+    // Always fetch the latest callbackEnv from AdapterService.
+    // Caching this could cause this sCallbackEnv to go out-of-sync
+    // with the AdapterService's ENV if an ASSOCIATE/DISASSOCIATE event
+    // is received
+    //if (sCallbackEnv == NULL) {
+    sCallbackEnv = getCallbackEnv();
+    //}
 
     JNIEnv* env = AndroidRuntime::getJNIEnv();
     if (sCallbackEnv != env || sCallbackEnv == NULL) return false;

jni/com_android_bluetooth_hfp.cpp

diff --git a/jni/com_android_bluetooth_hfp.cpp b/jni/com_android_bluetooth_hfp.cpp
index 6b4c61e..f8b0b16 100644
--- a/jni/com_android_bluetooth_hfp.cpp
+++ b/jni/com_android_bluetooth_hfp.cpp
@@ -43,10 +43,13 @@
 static JNIEnv *sCallbackEnv = NULL;
 
 static bool checkCallbackThread() {
-    if (sCallbackEnv == NULL) {
-        sCallbackEnv = getCallbackEnv();
-    }
-
+    // Always fetch the latest callbackEnv from AdapterService.
+    // Caching this could cause this sCallbackEnv to go out-of-sync
+    // with the AdapterService's ENV if an ASSOCIATE/DISASSOCIATE event
+    // is received
+    //if (sCallbackEnv == NULL) {
+    sCallbackEnv = getCallbackEnv();
+    //}
     JNIEnv* env = AndroidRuntime::getJNIEnv();
     if (sCallbackEnv != env || sCallbackEnv == NULL) return false;
     return true;