diff --git a/android/bluetooth.c b/android/bluetooth.c
index 211e060..e71f808 100644
--- a/android/bluetooth.c
+++ b/android/bluetooth.c
@@ -879,6 +879,27 @@ static uint8_t device_bond_state(struct device *dev)
 	return HAL_BOND_STATE_NONE;
 }
 
+static void update_bond_state(struct device *dev, uint8_t status,
+					uint8_t old_bond, uint8_t new_bond)
+{
+	if (old_bond == new_bond)
+		return;
+
+	/*
+	 * 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 update_device_state(struct device *dev, uint8_t addr_type,
 				uint8_t status, bool pairing, bool paired,
 				bool bonded)
@@ -894,20 +915,7 @@ static void update_device_state(struct device *dev, uint8_t addr_type,
 
 	new_bond = device_bond_state(dev);
 
-	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);
-	}
+	update_bond_state(dev, status, old_bond, new_bond);
 }
 
 static void send_device_property(struct device *dev, uint8_t type,