summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2017-06-08 21:41:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-06-08 21:42:03 +0000
commit87352c8889d15a8cf5e8c2ca1b599f7833589133 (patch)
tree7854eb84d7a2b137c521971aa17e5704f1496ebc
parenta1bb6957f56e6618d8e1d9fb2e6e7209d1933249 (diff)
parent6aca2adde354417e8ffa737b12f0f153cb379cd9 (diff)
Merge "Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f209f am: c0fed83b84 am: 3b852973e3 am: fcc30a6db3"
-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 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);
}
/**