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

Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev

Browse Source 
am: 556b10a4e6

Change-Id: I9477ac6e3990a4e2db4a8254f11702b1557591f3
This commit is contained in:
Jakub Pawlowski
2017-06-09 00:03:31 +00:00
committed by android-build-merger
parent afa235e444 556b10a4e6
commit 25278b0197
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

@@ -1658,7 +1658,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));
} }
/** /**
@@ -1682,7 +1682,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);
} }
/** /**