Fix to ensure that we are able to pair with a device that was just unpaired. The...

Change-Id: Iaad0e21794b0b6e47d12c837ef36e026b6ece655

diff --git a/src/com/android/bluetooth/btservice/BondStateMachine.java b/src/com/android/bluetooth/btservice/BondStateMachine.java
index 70cfac6..ee11ea3 100755 (executable)
--- a/src/com/android/bluetooth/btservice/BondStateMachine.java
+++ b/src/com/android/bluetooth/btservice/BondStateMachine.java
@@ -154,6 +154,11 @@ final class BondStateMachine extends StateMachine {
                         /* this is either none/bonded, remove and transition */
                         result = !mDevices.remove(dev);
                         if (mDevices.isEmpty()) {
+                            // Whenever mDevices is empty, then we need to
+                            // set result=false. Else, we will end up adding
+                            // the device to the list again. This prevents us
+                            // from pairing with a device that we just unpaired
+                            result = false;
                             transitionTo(mStableState);
                         }
                     }