summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2014-03-10 07:54:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-03-10 07:54:28 +0000
commit5d082f1826cd5b72cd2a0eb0116c8a613d7555dd (patch)
tree68bf300da695d069f34a9b2540aca21e780930cd
parent282ab1b6b1a92b8cb2650c111bfab02916f8715d (diff)
parent0932359d5bb2994531737be30f895df04ee53743 (diff)
downloadlibhardware-5d082f1826cd5b72cd2a0eb0116c8a613d7555dd.tar.gz
Merge "Fix PAN control callback definition to match what bluedroid is doing."
-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 c8b36b40..83e7949b 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;