summaryrefslogtreecommitdiffstats
path: root/include/hardware/bt_pan.h
diff options
context:
space:
mode:
authorSharvil Nanavati <sharvil@google.com>2014-02-01 13:31:39 -0800
committerSharvil Nanavati <sharvil@google.com>2014-02-01 16:39:50 -0800
commit0932359d5bb2994531737be30f895df04ee53743 (patch)
tree33eaf3c46434062c75d165b7502eddef7f45a55b /include/hardware/bt_pan.h
parentaea8c156649c16347514741eb084858cdb458b75 (diff)
downloadhardware_libhardware-0932359d5bb2994531737be30f895df04ee53743.zip
hardware_libhardware-0932359d5bb2994531737be30f895df04ee53743.tar.gz
hardware_libhardware-0932359d5bb2994531737be30f895df04ee53743.tar.bz2
Fix PAN control callback definition to match what bluedroid is doing.
There's a discrepancy in the order of arguments between the interface and the implementation. bluedroid swaps the |error| and |local_role| arguments when calling back so this change redefines the interface for consistency. http://b/12853951 Change-Id: I0ccfc6d6d2002d647d484ab7f53744863b569502
Diffstat (limited to 'include/hardware/bt_pan.h')
-rw-r--r--include/hardware/bt_pan.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hardware/bt_pan.h b/include/hardware/bt_pan.h
index c8b36b4..83e7949 100644
--- a/include/hardware/bt_pan.h
+++ b/include/hardware/bt_pan.h
@@ -40,8 +40,8 @@ typedef enum {
*/
typedef void (*btpan_connection_state_callback)(btpan_connection_state_t state, bt_status_t error,
const bt_bdaddr_t *bd_addr, int local_role, int remote_role);
-typedef void (*btpan_control_state_callback)(btpan_control_state_t state, bt_status_t error,
- int local_role, const char* ifname);
+typedef void (*btpan_control_state_callback)(btpan_control_state_t state, int local_role,
+ bt_status_t error, const char* ifname);
typedef struct {
size_t size;