diff --git a/android/hal-a2dp.c b/android/hal-a2dp.c
index 99cd147..3556218 100644
--- a/android/hal-a2dp.c
+++ b/android/hal-a2dp.c
cmd.service_id = HAL_SERVICE_ID_A2DP;
cmd.mode = HAL_MODE_DEFAULT;
+ cmd.max_clients = 1;
ret = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
sizeof(cmd), &cmd, NULL, NULL, NULL);
diff --git a/android/hal-avrcp.c b/android/hal-avrcp.c
index 4202bfa..b9b8ab9 100644
--- a/android/hal-avrcp.c
+++ b/android/hal-avrcp.c
cmd.service_id = HAL_SERVICE_ID_AVRCP;
cmd.mode = HAL_MODE_DEFAULT;
+ cmd.max_clients = 1;
ret = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
sizeof(cmd), &cmd, NULL, NULL, NULL);
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 164e232..68811df 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
cmd.service_id = HAL_SERVICE_ID_BLUETOOTH;
cmd.mode = get_mode();
+ cmd.max_clients = 1;
status = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
sizeof(cmd), &cmd, NULL, NULL, NULL);
cmd.service_id = HAL_SERVICE_ID_SOCKET;
cmd.mode = HAL_MODE_DEFAULT;
+ cmd.max_clients = 1;
status = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
sizeof(cmd), &cmd, NULL, NULL, NULL);
diff --git a/android/hal-gatt.c b/android/hal-gatt.c
index 7bcdee7..6df59f5 100644
--- a/android/hal-gatt.c
+++ b/android/hal-gatt.c
cmd.service_id = HAL_SERVICE_ID_GATT;
cmd.mode = HAL_MODE_DEFAULT;
+ cmd.max_clients = 1;
ret = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
sizeof(cmd), &cmd, NULL, NULL, NULL);
diff --git a/android/hal-handsfree-client.c b/android/hal-handsfree-client.c
index a152cab..8c6a5ed 100644
--- a/android/hal-handsfree-client.c
+++ b/android/hal-handsfree-client.c
sizeof(ev_handlers)/sizeof(ev_handlers[0]));
cmd.service_id = HAL_SERVICE_ID_HANDSFREE_CLIENT;
+ cmd.mode = HAL_MODE_DEFAULT;
+ cmd.max_clients = 1;
ret = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
sizeof(cmd), &cmd, NULL, NULL, NULL);
diff --git a/android/hal-health.c b/android/hal-health.c
index 01bc432..8462736 100644
--- a/android/hal-health.c
+++ b/android/hal-health.c
cmd.service_id = HAL_SERVICE_ID_HEALTH;
cmd.mode = HAL_MODE_DEFAULT;
+ cmd.max_clients = 1;
ret = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
sizeof(cmd), &cmd, NULL, NULL, NULL);
diff --git a/android/hal-hidhost.c b/android/hal-hidhost.c
index 31997e2..58b0218 100644
--- a/android/hal-hidhost.c
+++ b/android/hal-hidhost.c
cmd.service_id = HAL_SERVICE_ID_HIDHOST;
cmd.mode = HAL_MODE_DEFAULT;
+ cmd.max_clients = 1;
ret = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
sizeof(cmd), &cmd, NULL, NULL, NULL);
diff --git a/android/hal-map-client.c b/android/hal-map-client.c
index 8255d2b..6c927d4 100644
--- a/android/hal-map-client.c
+++ b/android/hal-map-client.c
sizeof(ev_handlers)/sizeof(ev_handlers[0]));
cmd.service_id = HAL_SERVICE_ID_MAP_CLIENT;
+ cmd.mode = HAL_MODE_DEFAULT;
+ cmd.max_clients = 1;
ret = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
sizeof(cmd), &cmd, 0, NULL, NULL);
diff --git a/android/hal-pan.c b/android/hal-pan.c
index 56fd340..cd783bc 100644
--- a/android/hal-pan.c
+++ b/android/hal-pan.c
cmd.service_id = HAL_SERVICE_ID_PAN;
cmd.mode = HAL_MODE_DEFAULT;
+ cmd.max_clients = 1;
ret = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
sizeof(cmd), &cmd, NULL, NULL, NULL);