android/discovery: If a GATT read fails, try the next device!
(Fix by jhahn@, I just happen to be in a more convenient position to
submit it)
Change-Id: Ic4b3588aea7fb7f72bb5089bf6993d4ce499c51a
diff --git a/android-lib/src/main/java/io/v/android/impl/google/discovery/plugins/ble/GattReader.java b/android-lib/src/main/java/io/v/android/impl/google/discovery/plugins/ble/GattReader.java
index 2f2ac35..921fef0 100644
--- a/android-lib/src/main/java/io/v/android/impl/google/discovery/plugins/ble/GattReader.java
+++ b/android-lib/src/main/java/io/v/android/impl/google/discovery/plugins/ble/GattReader.java
@@ -169,18 +169,18 @@
return;
}
- // Reset the connection timer.
- if (!mCurrentGattConnectionTimeout.cancel(false)) {
- // Already cancelled.
- return;
- }
-
if (status != BluetoothGatt.GATT_SUCCESS || newState != BluetoothGatt.STATE_CONNECTED) {
Log.e(TAG, "connection failed: " + mCurrentDevice + " , status: " + status);
cancelAndMaybeReadNextDevice();
return;
}
+ // Reset the connection timer.
+ if (!mCurrentGattConnectionTimeout.cancel(false)) {
+ // Already cancelled.
+ return;
+ }
+
// MTU exchange is not allowed on a BR/EDR physical link.
// (Bluetooth Core Specification Volume 3, Part G, 4.3.1)
//
