diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-30 11:50:17 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-30 11:50:17 -0700 |
| commit | ef167667a4496d4717c7efd06c1bb076c708b9ee (patch) | |
| tree | 17101507866869cc0736bf0ff0b1a1613b31341d /stack/btm | |
| parent | 718ba0bd6de6a0f4b8c63f0146f8978981eb5cb4 (diff) | |
| parent | a3332052991ae4b98c0f2544548c8d8bf3ab7231 (diff) | |
| download | android_system_bt-ef167667a4496d4717c7efd06c1bb076c708b9ee.tar.gz android_system_bt-ef167667a4496d4717c7efd06c1bb076c708b9ee.tar.bz2 android_system_bt-ef167667a4496d4717c7efd06c1bb076c708b9ee.zip | |
Merge branch 'LA.BF.1.1.3_rb1.11' of git://codeaurora.org/platform/system/bt into cm-13.0
Change-Id: Ib0f8f87bd5655ce85227bfc016044b1daa09ebe7
Diffstat (limited to 'stack/btm')
| -rw-r--r-- | stack/btm/btm_acl.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/stack/btm/btm_acl.c b/stack/btm/btm_acl.c index 7e3af0616..322a5f72f 100644 --- a/stack/btm/btm_acl.c +++ b/stack/btm/btm_acl.c @@ -562,41 +562,44 @@ void btm_acl_update_busy_level (tBTM_BLI_EVENT event) { case BTM_BLI_ACL_UP_EVT: BTM_TRACE_DEBUG ("BTM_BLI_ACL_UP_EVT"); + busy_level = BTM_GetNumAclLinks(); break; case BTM_BLI_ACL_DOWN_EVT: BTM_TRACE_DEBUG ("BTM_BLI_ACL_DOWN_EVT"); + busy_level = BTM_GetNumAclLinks(); break; case BTM_BLI_PAGE_EVT: BTM_TRACE_DEBUG ("BTM_BLI_PAGE_EVT"); btm_cb.is_paging = TRUE; evt.busy_level_flags= BTM_BL_PAGING_STARTED; + busy_level = BTM_BL_PAGING_STARTED; break; case BTM_BLI_PAGE_DONE_EVT: BTM_TRACE_DEBUG ("BTM_BLI_PAGE_DONE_EVT"); btm_cb.is_paging = FALSE; evt.busy_level_flags = BTM_BL_PAGING_COMPLETE; + busy_level = BTM_BL_PAGING_COMPLETE; break; case BTM_BLI_INQ_EVT: BTM_TRACE_DEBUG ("BTM_BLI_INQ_EVT"); btm_cb.is_inquiry = TRUE; evt.busy_level_flags = BTM_BL_INQUIRY_STARTED; + busy_level = BTM_BL_INQUIRY_STARTED; break; case BTM_BLI_INQ_CANCEL_EVT: BTM_TRACE_DEBUG ("BTM_BLI_INQ_CANCEL_EVT"); btm_cb.is_inquiry = FALSE; evt.busy_level_flags = BTM_BL_INQUIRY_CANCELLED; + busy_level = BTM_BL_INQUIRY_COMPLETE; break; case BTM_BLI_INQ_DONE_EVT: BTM_TRACE_DEBUG ("BTM_BLI_INQ_DONE_EVT"); btm_cb.is_inquiry = FALSE; evt.busy_level_flags = BTM_BL_INQUIRY_COMPLETE; + busy_level = BTM_BL_INQUIRY_COMPLETE; break; } - if (btm_cb.is_paging || btm_cb.is_inquiry) - busy_level = 10; - else - busy_level = BTM_GetNumAclLinks(); if ((busy_level != btm_cb.busy_level) ||(old_inquiry_state != btm_cb.is_inquiry)) { |