Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: fix connectGatt overload invocations"

Browse Source 
am: 404e9f209f

Change-Id: I01699795f733fbf46af10ba25afd8cb3feecc9ea
This commit is contained in:
Jakub Pawlowski
2017-06-08 21:12:26 +00:00
committed by android-build-merger
parent 00c6c3be77 404e9f209f
commit c0fed83b84
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -1669,7 +1669,7 @@ public final class BluetoothDevice implements Parcelable {
*/ */
public BluetoothGatt connectGatt(Context context, boolean autoConnect, public BluetoothGatt connectGatt(Context context, boolean autoConnect,
BluetoothGattCallback callback, int transport) { 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, public BluetoothGatt connectGatt(Context context, boolean autoConnect,
BluetoothGattCallback callback, int transport, int phy) { 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);
} }
/** /**