diff options
| author | Ariel Gertzenstein <agertzen@google.com> | 2014-02-01 13:31:39 -0800 |
|---|---|---|
| committer | Ariel Gertzenstein <agertzen@google.com> | 2014-04-16 14:53:45 -0400 |
| commit | 40208a8b2baf9629c12966e52f2f901b3019670c (patch) | |
| tree | 618631db700b9d11ab355925ae73d5b17d32033f | |
| parent | 4d7ac52d75b725ff25d68416747bfd43bbbc065d (diff) | |
| download | hardware_libhardware-40208a8b2baf9629c12966e52f2f901b3019670c.zip hardware_libhardware-40208a8b2baf9629c12966e52f2f901b3019670c.tar.gz hardware_libhardware-40208a8b2baf9629c12966e52f2f901b3019670c.tar.bz2 | |
DO NOT MERGE 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
| -rw-r--r-- | include/hardware/bt_pan.h | 4 |
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; |