Fixed checkCallbck thread so that callback env is always intitialized

Change-Id: Id959c99a0aa7823d36a0437d0b59972052f3edb9

diff --git a/jni/com_android_bluetooth_hid.cpp b/jni/com_android_bluetooth_hid.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 845b728..cae1056
--- a/jni/com_android_bluetooth_hid.cpp
+++ b/jni/com_android_bluetooth_hid.cpp
@@ -28,9 +28,13 @@ static jobject mCallbacksObj = NULL;
 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
+
+    sCallbackEnv = getCallbackEnv();
 
     JNIEnv* env = AndroidRuntime::getJNIEnv();
     if (sCallbackEnv != env || sCallbackEnv == NULL) return false;