diff options
| author |   Matt Ranostay <matt.ranostay@konsulko.com> | 2017-07-21 14:33:07 -0700 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-07-24 21:54:26 +0000 |
| commit | 76d2404f4500a68e07c0778c3c9bb0d5f0e7c89f (patch) | |
| tree | 834227e8c86c56aeea723c5606303a48d5728c8e /binding-bluetooth | |
| parent | 93e0bcdda8298df869b069661d313e53c87a8b33 (diff) | |
binding: bluetooth: remove race condition workaround
Workaround that was likely in place to avoid the Settings
applications UI from loading before all binding functionality
was enabled.
Bug-AGL: SPEC-569
Change-Id: I7c4bc7614192cb09cace555acf77f27fbda0c42a
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
Diffstat (limited to 'binding-bluetooth')
| -rw-r--r-- | binding-bluetooth/bluetooth-api.c | 6 | ||||
| -rw-r--r-- | binding-bluetooth/bluetooth-manager.c | 1 | ||||
| -rw-r--r-- | binding-bluetooth/export.map | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/binding-bluetooth/bluetooth-api.c b/binding-bluetooth/bluetooth-api.c index b454277..39acb9a 100644 --- a/binding-bluetooth/bluetooth-api.c +++ b/binding-bluetooth/bluetooth-api.c @@ -948,17 +948,13 @@ const struct afb_binding *afbBindingV1Register (const struct afb_binding_interfa API_Callback.binding_request_confirmation = bt_request_confirmation; BindingAPIRegister(&API_Callback); - BluetoothManagerInit(); - return &binding_description; } -#if 0 int afbBindingV1ServiceInit(struct afb_service service) { - return BluetoothManageInit(); + return BluetoothManagerInit(); } -#endif /***************************** The End Of File ******************************/ diff --git a/binding-bluetooth/bluetooth-manager.c b/binding-bluetooth/bluetooth-manager.c index 5ce90ce..007986c 100644 --- a/binding-bluetooth/bluetooth-manager.c +++ b/binding-bluetooth/bluetooth-manager.c @@ -1739,7 +1739,6 @@ int BluetoothManagerInit() { pthread_create(&thread_id, NULL, bt_event_loop_thread, NULL); //pthread_setname_np(thread_id, "BT_Manager"); - sleep(1); return 0; } diff --git a/binding-bluetooth/export.map b/binding-bluetooth/export.map index 0ef1ac7..52c1b4a 100644 --- a/binding-bluetooth/export.map +++ b/binding-bluetooth/export.map @@ -1 +1 @@ -{ global: afbBindingV1Register; local: *; }; +{ global: afbBindingV1*; local: *; }; |