summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jakub Pawlowski <jpawlowski@google.com> 2017-06-09 00:03:31 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-09 00:03:31 +0000
commit25278b0197094f938f8b9cecf88f35e998a689da (patch)
treede78f8b426121a9cd72c1c30624828ab9eb056ca
parentafa235e444143319e554158cd33933ba63635ed6 (diff)
parent556b10a4e6e07860913e24253a5aeca91284bf55 (diff)
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
am: 556b10a4e6 Change-Id: I9477ac6e3990a4e2db4a8254f11702b1557591f3
-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);
}
/**