commit e61df6e91aa6320da78593706f0bd129084963e3
author Bailey Forrest <bcf@google.com> Wed Mar 01 11:27:05 2017 -0800
committer Andre Eisenbach <eisenbach@google.com> Tue Jul 24 22:55:30 2018 +0000
tree 21eb4066972ce6ccc3e8ff3ed82e70918ccde68c
parent 62fee1a223f771ada01f9e455018260adf3a8448

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

service/hal/bluetooth_gatt_interface.cc

diff --git a/service/hal/bluetooth_gatt_interface.cc b/service/hal/bluetooth_gatt_interface.cc
index 35b295b..d61a238 100644
--- a/service/hal/bluetooth_gatt_interface.cc
+++ b/service/hal/bluetooth_gatt_interface.cc
@@ -148,7 +148,7 @@
   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::RegisterForNotificationCallback(
     BluetoothGattInterface* /* gatt_iface */, int /* conn_id */,
-    int /* status */, int /* registered */, uint16_t /* handle */) {
+    int /* registered */, int /* status */, uint16_t /* handle */) {
   // Do nothing
 }
 

service/hal/bluetooth_gatt_interface.h

diff --git a/service/hal/bluetooth_gatt_interface.h b/service/hal/bluetooth_gatt_interface.h
index 08b0e9b..ccd0ae9 100644
--- a/service/hal/bluetooth_gatt_interface.h
+++ b/service/hal/bluetooth_gatt_interface.h
@@ -81,8 +81,8 @@
                                         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);