commit 986b5b03a378385bfea6c5cc6b6c1d7f0424e0a5
author Ravi Nagarajan <nravi@broadcom.com> Fri Mar 09 09:00:20 2012 +0530
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 16 21:48:38 2012 -0700
tree 7dba15db0d0556ff1e5247a051c818ca456b01a7
parent 9b300c1a33952a22c3bba1521da2d01cbf607b7b

Added new state BT_BOND_STATE_BONDING. Stack will send a callback for all three states, app does not have to rely on the api return code to switch to bonding. This addresses the incoming pairing as well as the remote unpaired test cases

Change-Id: I37208e5bae7264a0ff78195322ba0a6bd1d82f0f

src/com/android/bluetooth/btservice/BondStateMachine.java

diff --git a/src/com/android/bluetooth/btservice/BondStateMachine.java b/src/com/android/bluetooth/btservice/BondStateMachine.java
index b9232a2..cea5175 100644
--- a/src/com/android/bluetooth/btservice/BondStateMachine.java
+++ b/src/com/android/bluetooth/btservice/BondStateMachine.java
@@ -35,6 +35,10 @@
     static final int REMOVE_BOND = 3;
     static final int BONDING_STATE_CHANGE = 4;
 
+    static final int BOND_STATE_NONE = 0;
+    static final int BOND_STATE_BONDING = 1;
+    static final int BOND_STATE_BONDED = 2;
+
     private final AdapterService mAdapterService;
     private final Context mContext;
     private final AdapterProperties mAdapterProperties;
@@ -71,8 +75,21 @@
               case REMOVE_BOND:
                   removeBond(dev, true);
                   break;
-              case CANCEL_BOND:
               case BONDING_STATE_CHANGE:
+                int newState = msg.arg1;
+                /* if incoming pairing, transition to pending state */
+                if (newState == BluetoothDevice.BOND_BONDING)
+                {
+                    sendIntent(dev, newState);
+                    transitionTo(mPendingCommandState);
+                }
+                else
+                {
+                    Log.e(TAG, "In stable state, received invalid newState: " + newState);
+                }
+                break;
+
+              case CANCEL_BOND:
               default:
                    Log.e(TAG, "Received unhandled state: " + msg.what);
                    return false;
@@ -115,10 +132,20 @@
                 case BONDING_STATE_CHANGE:
                     int newState = msg.arg1;
                     sendIntent(dev, newState);
-                    result = mDevices.remove(dev);
-                    if (mDevices.isEmpty()) {
-                        transitionTo(mStableState);
+
+                    if (newState == BluetoothDevice.BOND_BONDING)
+                    {
+                        result = true;
                     }
+                    else
+                    {
+                        /* this is either none/bonded, remove and transition */
+                        result = !mDevices.remove(dev);
+                        if (mDevices.isEmpty()) {
+                            transitionTo(mStableState);
+                        }
+                    }
+
                     break;
                 default:
                     Log.e(TAG, "Received unhandled event:" + msg.what);
@@ -158,11 +185,11 @@
 
     private boolean createBond(BluetoothDevice dev, boolean transition) {
         if (dev.getBondState() == BluetoothDevice.BOND_NONE) {
-            sendIntent(dev, BluetoothDevice.BOND_BONDING);
             infoLog("Bond address is:" + dev);
             byte[] addr = Utils.getBytesFromAddress(dev.getAddress());
             if (!mAdapterService.createBondNative(addr)) {
                 sendIntent(dev, BluetoothDevice.BOND_NONE);
+                return false;
             } else if (transition) {
                 transitionTo(mPendingCommandState);
             }
@@ -201,8 +228,13 @@
         Message msg = obtainMessage(BONDING_STATE_CHANGE);
         msg.obj = device;
 
-        int state = (newState == 1 ? BluetoothDevice.BOND_BONDED : BluetoothDevice.BOND_NONE);
-        msg.arg1 = state;
+        if (newState == BOND_STATE_BONDED)
+            msg.arg1 = BluetoothDevice.BOND_BONDED;
+        else if (newState == BOND_STATE_BONDING)
+            msg.arg1 = BluetoothDevice.BOND_BONDING;
+        else
+            msg.arg1 = BluetoothDevice.BOND_NONE;
+
         sendMessage(msg);
     }