Diff between d52939fde909bae869bad70894dd4407e1337e5f and 39bf745e92b79891c43b42de662fb41c42b3b30e

Changed Files

File Additions Deletions Status
android/hal-bluetooth.c +12 -0 modified
android/hal-ipc.c +4 -0 modified
android/hal.h +2 -0 modified

Full Patch

diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 9c7fbea..894f5b5 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -66,6 +66,18 @@ static void handle_adapter_props_changed(void *buf, uint16_t len)
 	bt_hal_cbacks->adapter_properties_cb(ev->status, ev->num_props, props);
 }
 
+void bt_thread_associate(void)
+{
+	if (bt_hal_cbacks->thread_evt_cb)
+		bt_hal_cbacks->thread_evt_cb(ASSOCIATE_JVM);
+}
+
+void bt_thread_disassociate(void)
+{
+	if (bt_hal_cbacks->thread_evt_cb)
+		bt_hal_cbacks->thread_evt_cb(DISASSOCIATE_JVM);
+}
+
 /* will be called from notification thread context */
 void bt_notify_adapter(uint16_t opcode, void *buf, uint16_t len)
 {
diff --git a/android/hal-ipc.c b/android/hal-ipc.c
index c7764ab..5723841 100644
--- a/android/hal-ipc.c
+++ b/android/hal-ipc.c
@@ -67,6 +67,8 @@ static void *notification_handler(void *data)
 	ssize_t ret;
 	int fd;
 
+	bt_thread_associate();
+
 	while (true) {
 		memset(&msg, 0, sizeof(msg));
 		memset(buf, 0, sizeof(buf));
@@ -133,6 +135,8 @@ static void *notification_handler(void *data)
 	close(notif_sk);
 	notif_sk = -1;
 
+	bt_thread_disassociate();
+
 	DBG("exit");
 
 	return NULL;
diff --git a/android/hal.h b/android/hal.h
index ef9a107..5cd5cab 100644
--- a/android/hal.h
+++ b/android/hal.h
@@ -27,3 +27,5 @@ btpan_interface_t *bt_get_pan_interface(void);
 btav_interface_t *bt_get_av_interface(void);
 
 void bt_notify_adapter(uint16_t opcode, void *buf, uint16_t len);
+void bt_thread_associate(void);
+void bt_thread_disassociate(void);