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

Commit b825618f authored by Bailey Forrest's avatar Bailey Forrest Committed by android-build-merger
Browse files

Merge "Swap order of registered/status in RegisterForNotificationCallback" am:... 

Merge "Swap order of registered/status in RegisterForNotificationCallback" am: 5c9ab99a am: f9e0de5e
am: adbc1a0c

Change-Id: I458f37963965831d935f4d7a0e7db070215917c7
parents d898690a adbc1a0c

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);