diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2014-11-07 12:42:00 +0200 |
|---|---|---|
| committer | Szymon Janc <szymon.janc@tieto.com> | 2014-11-07 12:51:27 +0100 |
| commit | 4c150a0a5b35fdf273ecda674c19c5a3ec1dfbe8 (patch) | |
| tree | ff7a04376655df4706fa6d695b2edd40e8215f4d /android/tester-main.c | |
| parent | cf495fb1f0c45b9d0a7c7bbdfb386f155b75015f (diff) | |
| download | bluez-4c150a0a5b35fdf273ecda674c19c5a3ec1dfbe8.tar.gz | |
android: Update Android system headers to 5.0 API
Android headers are used for Linux host build.
Diffstat (limited to 'android/tester-main.c')
| -rw-r--r-- | android/tester-main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/android/tester-main.c b/android/tester-main.c index c14f7dc90..7ead0e942 100644 --- a/android/tester-main.c +++ b/android/tester-main.c @@ -19,6 +19,7 @@ #include "src/shared/util.h" #include "emulator/bthost.h" #include "tester-main.h" +#include "hal-msg.h" #include "monitor/bt.h" @@ -1324,7 +1325,8 @@ static bt_callbacks_t bt_callbacks = { .acl_state_changed_cb = acl_state_changed_cb, .thread_evt_cb = NULL, .dut_mode_recv_cb = NULL, - .le_test_mode_cb = NULL + .le_test_mode_cb = NULL, + .energy_info_cb = NULL, }; static void hidhost_connection_state_cb(bt_bdaddr_t *bd_addr, @@ -1852,8 +1854,8 @@ static void gatts_request_write_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, } static void pan_control_state_cb(btpan_control_state_t state, - bt_status_t error, int local_role, - const char *ifname) + int local_role, bt_status_t error, + const char *ifname) { struct step *step = g_new0(struct step, 1); @@ -2905,7 +2907,8 @@ void bt_create_bond_action(void) } step->action_status = - data->if_bluetooth->create_bond(action_data->addr); + data->if_bluetooth->create_bond(action_data->addr, + BT_TRANSPORT_UNKNOWN); schedule_action_verification(step); } |