From 811c5edc0078e7b358a4b5772d870898f428f6d2 Mon Sep 17 00:00:00 2001 From: Lukasz Rymanowski Date: Tue, 26 Aug 2014 22:41:48 +0200 Subject: [PATCH] android/bluetooth: Fix incoming just works bonding With this patch Android framework will be notified about bonded device which initiated bonding and used just works association model. --- android/bluetooth.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/android/bluetooth.c b/android/bluetooth.c index 984ecbad5..96f610162 100644 --- a/android/bluetooth.c +++ b/android/bluetooth.c @@ -889,8 +889,20 @@ static void update_device_state(struct device *dev, uint8_t addr_type, new_bond = device_bond_state(dev); - if (old_bond != new_bond) + if (old_bond != new_bond) { + /* + * For incoming just works bonding we will switch here from + * non bonded to bonded directly. This is something Android + * will not handle in their bond state machine. To make Android + * handle it corretly we need to send BONDING state before BOND + */ + if (old_bond == HAL_BOND_STATE_NONE && + new_bond == HAL_BOND_STATE_BONDED) + send_bond_state_change(dev, status, + HAL_BOND_STATE_BONDING); + send_bond_state_change(dev, status, new_bond); + } } static void send_device_property(struct device *dev, uint8_t type, -- 2.47.3