Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2e54543 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Bluetooth: fix connectGatt overload invocations" am: c9f690e3 

am: c0fed83b84

Change-Id: I871bc30dcd7aeb5c4a6f6c15d84b43dee84994f2
parents d41e23c4 c9f690e3

framework/java/android/bluetooth/BluetoothDevice.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**