Merge cherrypicks of [20103349] into tm-qpr1-release.
Change-Id: I970d3009e078eaa79318e8653e01a14a94d7d080
diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
index 60e9797..4bdd943 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
@@ -576,11 +576,15 @@
@Rpc(description = "Bluetooth init Bond by Mac Address")
public boolean bluetoothBond(@RpcParameter(name = "macAddress") String macAddress) {
+ mContext.registerReceiver(new BondBroadcastReceiver(),
+ new IntentFilter(BluetoothDevice.ACTION_BOND_STATE_CHANGED));
return mBluetoothAdapter.getRemoteDevice(macAddress).createBond();
}
@Rpc(description = "Bluetooth init LE Bond by Mac Address")
public boolean bluetoothLeBond(@RpcParameter(name = "macAddress") String macAddress) {
+ mContext.registerReceiver(new BondBroadcastReceiver(),
+ new IntentFilter(BluetoothDevice.ACTION_BOND_STATE_CHANGED));
return mBluetoothAdapter.getRemoteDevice(macAddress).createBond(BluetoothDevice.TRANSPORT_LE);
}
diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattClientFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattClientFacade.java
index e228672..176dd30 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattClientFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/GattClientFacade.java
@@ -270,6 +270,21 @@
}
/**
+ * Reconnect to a Bluetooth GATT server
+ *
+ * @param index the bluetooth gatt index
+ * @throws Exception
+ */
+ @Rpc(description = "Reconnect a bluetooth gatt")
+ public void gattClientReconnect(@RpcParameter(name = "index") Integer index) throws Exception {
+ if (mBluetoothGattList.get(index) != null) {
+ mBluetoothGattList.get(index).connect();
+ } else {
+ throw new Exception("Invalid index input: " + index);
+ }
+ }
+
+ /**
* Disconnect a bluetooth gatt
*
* @param index the bluetooth gatt index
