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

Commit 44f03749 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Extend interface to support getting remote services with the specific transport"

parents f073d57f af6ec99b

system/binder/android/bluetooth/IBluetooth.aidl

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ interface IBluetooth 
    int getRemoteClass(in BluetoothDevice device);

    ParcelUuid[] getRemoteUuids(in BluetoothDevice device);

    @UnsupportedAppUsage

    boolean fetchRemoteUuids(in BluetoothDevice device);

    boolean fetchRemoteUuids(in BluetoothDevice device, in int transport);

    boolean sdpSearch(in BluetoothDevice device, in ParcelUuid uuid);

    int getBatteryLevel(in BluetoothDevice device);

    int getMaxConnectedAudioDevices();

system/btif/src/bluetooth.cc

+2 −2
Original line number Diff line number Diff line
@@ -282,11 +282,11 @@ int set_remote_device_property(RawAddress* remote_addr, 
  return BT_STATUS_SUCCESS;

}



int get_remote_services(RawAddress* remote_addr) {

int get_remote_services(RawAddress* remote_addr, int transport) {

  if (!interface_ready()) return BT_STATUS_NOT_READY;



  do_in_main_thread(FROM_HERE, base::BindOnce(btif_dm_get_remote_services,

                                              *remote_addr, BT_TRANSPORT_AUTO));

                                              *remote_addr, transport));

  return BT_STATUS_SUCCESS;

}

system/include/hardware/bluetooth.h

+2 −2
Original line number Diff line number Diff line
@@ -600,8 +600,8 @@ typedef struct { 
  int (*get_remote_service_record)(const RawAddress& remote_addr,

                                   const bluetooth::Uuid& uuid);



  /** Start SDP to get remote services */

  int (*get_remote_services)(RawAddress* remote_addr);

  /** Start service discovery with tranport to get remote services */

  int (*get_remote_services)(RawAddress* remote_addr, int transport);



  /** Start Discovery */

  int (*start_discovery)(void);