summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJakub Pawlowski <jpawlowski@google.com>2017-06-08 21:12:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-08 21:12:26 +0000
commitc0fed83b84dd7a85e242a3cef16c1bd18578e92d (patch)
tree92c1228b3dc4a0dfb0910888d1c9a976c7f5a2a4 /core/java
parent00c6c3be77b948cdb51887b53b5531673d9a2ee5 (diff)
parent404e9f209f28ba02206cb5b0fd7bef9aa1587914 (diff)
Merge "Bluetooth: fix connectGatt overload invocations"
am: 404e9f209f Change-Id: I01699795f733fbf46af10ba25afd8cb3feecc9ea
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/bluetooth/BluetoothDevice.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index f158f5f29ecd..6bc88b03a122 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1669,7 +1669,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));
}
/**
@@ -1693,7 +1693,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);
}
/**