Snap for 9206145 from 98aaa98a29101aa02c2bd3f665fdbbbb07c70007 to tm-qpr2-release
Change-Id: Ia2e2bb5b37655bde69df5c0d884b44170bf8c5ed
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 f69ec8f..8e54d81 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothConnectionFacade.java
@@ -766,11 +766,17 @@
@RpcParameter(name = "deviceID",
description = "Name or MAC address of a bluetooth device.")
String deviceID) throws Exception {
- BluetoothDevice mDevice = BluetoothFacade.getDevice(mBluetoothAdapter.getBondedDevices(),
- deviceID);
- mContext.registerReceiver(new BondBroadcastReceiver(),
- new IntentFilter(BluetoothDevice.ACTION_BOND_STATE_CHANGED));
- return mDevice.removeBond();
+ // We don't want to crash the test if the test passes an address that cannot be found.
+ try {
+ BluetoothDevice mDevice = BluetoothFacade.getDevice(
+ mBluetoothAdapter.getBondedDevices(), deviceID);
+ mContext.registerReceiver(new BondBroadcastReceiver(),
+ new IntentFilter(BluetoothDevice.ACTION_BOND_STATE_CHANGED));
+ return mDevice.removeBond();
+ } catch (Exception e) {
+ Log.d("Failed to find the device by deviceId");
+ return false;
+ }
}
@Rpc(description = "Connect to a device that is already bonded.")
