diff options
| author | Matthew Xie <mattx@google.com> | 2014-03-11 18:52:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:52:02 +0000 |
| commit | faf51acb85fa235144b88fa1a88ec316a0de51da (patch) | |
| tree | 6817db5f741ce08f0beaaa0bef831a96468e2786 /include | |
| parent | f8e6a30ab98c544c1a5695455187ea7743dd1f40 (diff) | |
| parent | 5d082f1826cd5b72cd2a0eb0116c8a613d7555dd (diff) | |
| download | hardware_libhardware-faf51acb85fa235144b88fa1a88ec316a0de51da.zip hardware_libhardware-faf51acb85fa235144b88fa1a88ec316a0de51da.tar.gz hardware_libhardware-faf51acb85fa235144b88fa1a88ec316a0de51da.tar.bz2 | |
am 5d082f18: Merge "Fix PAN control callback definition to match what bluedroid is doing."
* commit '5d082f1826cd5b72cd2a0eb0116c8a613d7555dd':
Fix PAN control callback definition to match what bluedroid is doing.
Diffstat (limited to 'include')
| -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; |