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

Commit 2d8d6182 authored by Bailey Forrest's avatar Bailey Forrest Committed by Andre Eisenbach
Browse files

Swap order of registered/status in RegisterForNotificationCallback 

It's confusing how the order is inconsistent with the one defined in
hardware/libhardware/include/hardware/bt_gatt_client.h

Test: Build. Right now no code uses these functions.

Change-Id: I04b93ba74555455fd981a3809ea3e0bfffca4696
parent 10b081fc

system/service/hal/bluetooth_gatt_interface.cc

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void RegisterForNotificationCallback(int conn_id, int registered, int status, 
  LOG(INFO) << __func__ << " - conn_id: " << conn_id << " - status: " << status

            << " - registered: " << registered << " - handle: " << handle;

  FOR_EACH_CLIENT_OBSERVER(RegisterForNotificationCallback(

      g_interface, conn_id, status, registered, handle));

      g_interface, conn_id, registered, status, handle));

}



void NotifyCallback(int conn_id, const btgatt_notify_params_t& p_data) {
@@ -594,7 +594,7 @@ void BluetoothGattInterface::ClientObserver::SearchCompleteCallback( 


void BluetoothGattInterface::ClientObserver::RegisterForNotificationCallback(

    BluetoothGattInterface* /* gatt_iface */, int /* conn_id */,

    int /* status */, int /* registered */, uint16_t /* handle */) {

    int /* registered */, int /* status */, uint16_t /* handle */) {

  // Do nothing

}

system/service/hal/bluetooth_gatt_interface.h

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ class BluetoothGattInterface { 
                                        int conn_id, int status);



    virtual void RegisterForNotificationCallback(

        BluetoothGattInterface* gatt_iface, int conn_id, int status,

        int registered, uint16_t handle);

        BluetoothGattInterface* gatt_iface, int conn_id, int registered,

        int status, uint16_t handle);



    virtual void NotifyCallback(BluetoothGattInterface* gatt_iface, int conn_id,

                                const btgatt_notify_params_t& p_data);