commit 151f2a0a7fbd65096be4892936ce0e787f9d2fb9
author Jungho Ahn <jhahn@google.com> Thu Jun 02 15:59:06 2016 -0700
committer Jungho Ahn <jhahn@google.com> Thu Jun 02 15:59:06 2016 -0700
tree 102d9805000a1b92a3e23ae92679824c295bea51
parent 449ee0a836e49df8f40a5e6745e9f1a403c8a697

discovery: android ble driver

  * Prefer BR/EDR for Gatt connection for classic device

Change-Id: I4f96739971dc4542af4c11e9ff4cd170a9b9ebd5

android-lib/src/main/java/io/v/android/impl/google/discovery/plugins/ble/GattReader.java

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 886f705..2f2ac35 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
@@ -116,7 +116,15 @@
             return;
         }
 
-        mCurrentGatt = mCurrentDevice.connectGatt(mContext, false, this);
+        if ((mCurrentDevice.getType() == BluetoothDevice.DEVICE_TYPE_CLASSIC
+                        || mCurrentDevice.getType() == BluetoothDevice.DEVICE_TYPE_DUAL)
+                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            mCurrentGatt =
+                    mCurrentDevice.connectGatt(
+                            mContext, false, this, BluetoothDevice.TRANSPORT_BREDR);
+        } else {
+            mCurrentGatt = mCurrentDevice.connectGatt(mContext, false, this);
+        }
         mCurrentGattConnectionTimeout =
                 mExecutor.schedule(
                         new Runnable() {