diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2017-06-08 21:41:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-08 21:41:06 +0000 |
| commit | 6aca2adde354417e8ffa737b12f0f153cb379cd9 (patch) | |
| tree | fd11dc5dc843d08e92883ec831332bca0bc3e6fb /core/java | |
| parent | 48af81eb388def1dccc0f0902010687466655853 (diff) | |
| parent | fcc30a6db326058fa0e1fd0e49457205a0f14941 (diff) | |
Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f209f am: c0fed83b84 am: 3b852973e3
am: fcc30a6db3
Change-Id: I8ce718a0322408565530840d5131998f03535159
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index e8ad69d2f52e..7ff37d29323e 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -1658,7 +1658,7 @@ public final class BluetoothDevice implements Parcelable { */ public BluetoothGatt connectGatt(Context context, boolean autoConnect, BluetoothGattCallback callback, int transport) { - return (connectGatt(context, autoConnect,callback, TRANSPORT_AUTO, PHY_LE_1M_MASK)); + return (connectGatt(context, autoConnect,callback, transport, PHY_LE_1M_MASK)); } /** @@ -1682,7 +1682,7 @@ public final class BluetoothDevice implements Parcelable { */ public BluetoothGatt connectGatt(Context context, boolean autoConnect, BluetoothGattCallback callback, int transport, int phy) { - return connectGatt(context, autoConnect,callback, TRANSPORT_AUTO, PHY_LE_1M_MASK, null); + return connectGatt(context, autoConnect,callback, transport, phy, null); } /** |