OSDN Git Service
Andre Eisenbach [Mon, 21 Jul 2014 18:10:19 +0000 (18:10 +0000)]
am
5904e099: Merge "Fix A2DP audio playback problem" into lmp-dev
* commit '
5904e0995c83bbfd094a8e26a0ae6eb41eb0de27':
Fix A2DP audio playback problem
Mike J. Chen [Mon, 21 Jul 2014 17:32:30 +0000 (17:32 +0000)]
am
81cc400b: Merge "Make auto connect work for multiple known BLE devices" into lmp-dev
* commit '
81cc400b75694d9ddccf740f73cfef15222983c6':
Make auto connect work for multiple known BLE devices
Andre Eisenbach [Mon, 21 Jul 2014 17:57:47 +0000 (17:57 +0000)]
Merge "Fix A2DP audio playback problem" into lmp-dev
Andre Eisenbach [Sat, 19 Jul 2014 01:43:18 +0000 (18:43 -0700)]
Fix A2DP audio playback problem
With some A2DP headphones/car kits an issue was observed where the SBC
codec could not be initialized correctly and thus no audio was heard
over A2DP. This change fixes a variable initialization issue that
prevented the request for capabilities from being sent to the remote
device.
Change-Id: Ic55da0dbe5abd1e5bb89c8305b0a4c1f06b60a65
Elliott Hughes [Sun, 20 Jul 2014 17:59:56 +0000 (17:59 +0000)]
am
e86822ea: Merge "Fix implicit declaration of function \'prctl\' in bluedroid." into lmp-dev
* commit '
e86822ea2f896b92cbb98af849cfbed8c7c49223':
Fix implicit declaration of function 'prctl' in bluedroid.
Prerepa Viswanadham [Sun, 20 Jul 2014 17:59:55 +0000 (17:59 +0000)]
am
4c94c5f9: Fix build: Revert the reversion done due to build failure. original commit id:
347a1d64c7a9c345793c61b03bdcaa31ad8e5678 revert commit id:
571c81ed119833b5e5cbd6bedffd7409a10be21d
* commit '
4c94c5f9fc2c3102c52706fd5bb4cd8d065e5716':
Fix build: Revert the reversion done due to build failure. original commit id:
347a1d64c7a9c345793c61b03bdcaa31ad8e5678 revert commit id:
571c81ed119833b5e5cbd6bedffd7409a10be21d
Matthew Xie [Sun, 20 Jul 2014 02:19:10 +0000 (02:19 +0000)]
am
1ef4ba48: Merge "Bluetooth: fix the HOGP device(iBUFFALO BSMBB09DS) pair and reconnect problem." into lmp-dev
* commit '
1ef4ba488d259f6523b6e650fb80820d3a363302':
Bluetooth: fix the HOGP device(iBUFFALO BSMBB09DS) pair and reconnect problem.
Elliott Hughes [Sat, 19 Jul 2014 00:16:02 +0000 (00:16 +0000)]
am
3b404009: Merge "Fix implicit declaration of function \'prctl\' in bluedroid."
* commit '
3b4040093ddf0e0025d0dd034aa65078bb695514':
Fix implicit declaration of function 'prctl' in bluedroid.
Prerepa Viswanadham [Fri, 18 Jul 2014 22:20:54 +0000 (15:20 -0700)]
Fix build: Revert the reversion done due to build failure.
original commit id:
347a1d64c7a9c345793c61b03bdcaa31ad8e5678
revert commit id:
571c81ed119833b5e5cbd6bedffd7409a10be21d
Fix builds: Revert "Added code to publish ble adv tx power in dBm""
This reverts commit
571c81ed119833b5e5cbd6bedffd7409a10be21d.
Change-Id: I2afeeaa4b52aa449e54115fd5f816a7a949d2ea8
Chris Manton [Fri, 18 Jul 2014 20:41:32 +0000 (13:41 -0700)]
Initialize stack variable to eliminate warning
Change-Id: I4f4843da796d3c2b0aed3130b88d947491a341d0
Chris Manton [Fri, 18 Jul 2014 19:55:34 +0000 (12:55 -0700)]
Remove extraneous field inherited from parent makefile
Change-Id: I0d0bc0c5ed508f2d94c5644cb3b0f823bae5d83a
Andre Eisenbach [Thu, 17 Jul 2014 05:59:45 +0000 (22:59 -0700)]
LE: Add connection parameter update request API (2/4)
Change-Id: I131bfa7fb0a8cc970e1ac3e26e9d86ed2bee80a7
Matthew Xie [Fri, 18 Jul 2014 23:26:52 +0000 (23:26 +0000)]
Merge "Bluetooth: fix the HOGP device(iBUFFALO BSMBB09DS) pair and reconnect problem." into lmp-dev
Thomas.TT_Lin [Fri, 18 Jul 2014 04:10:59 +0000 (12:10 +0800)]
Bluetooth: fix the HOGP device(iBUFFALO BSMBB09DS) pair and reconnect problem.
in bta_hh_le.c (fix reconnect issue)
Since new LE security flags are import, (BTM_SEC_LE_AUTHENTICATED, BTM_SEC_LE_ENCRYPTED,
BTM_SEC_LE_NAME_KNOWN, BTM_SEC_LE_LINK_KEY_KNOWN, BTM_SEC_LE_LINK_KEY_AUTHED),
we have to use new BTM_GetSecurityFlagsByTransport() function with LE transport to get right sec_flag,
or will cause cannot correctly add to white list and cause reconnect fail.
in btif_dm.c (fix HOGP mouse pair issue)
the HOGP mouse will become abnormal if we update connection parameter too many times.
Therefore the is_hid case is not suitable for HOGP mouse,
it will trigger call to L2CA_EnableUpdateBleConnParams() several times due to service discovery and bonded state.
L2CA_EnableUpdateBleConnParams() update connection cause mouse abnormal.
The change will make the flow: complete bonding procedure first, then do service discovery, connect to mouse.
in gap_ble.c (fix HOGP device pair issue)
After pairing status is bonded, host start to create ATT layer to get some information from HOGP device.
If host send "disconnect" command during period. Device will stop to feedback anything.
Suggest to delete it.
in smp_act.c (fix HOGP device pair issue)
update connection parameter too many times may cause mouse abnormal,
so remove this code since this will be called again after service discovery.
Suggest to delete it.
Change-Id: I4b722343c2b08d33530bc6b928bc9ffe89fd09e9
Signed-off-by: Thomas.TT_Lin <Thomas.TT_Lin@htc.com>
Ed Heyl [Fri, 18 Jul 2014 08:05:38 +0000 (08:05 +0000)]
Fix builds: Revert "Added code to publish ble adv tx power in dBm"
This reverts commit
347a1d64c7a9c345793c61b03bdcaa31ad8e5678.
Change-Id: If62571a3f5bd87d04e5643855c9fea1b8048aa5a
git-zhenye.broadcom.com [Wed, 16 Jul 2014 00:32:21 +0000 (17:32 -0700)]
Added code to publish ble adv tx power in dBm
Bug
15412969
Sharvil Nanavati [Thu, 17 Jul 2014 22:45:40 +0000 (15:45 -0700)]
Fix build warning about unused argument.
Change-Id: I3ae26dfc4ffd97d039386f55e3290a6cf36ae17d
Elliott Hughes [Sat, 19 Jul 2014 00:09:05 +0000 (00:09 +0000)]
Merge "Fix implicit declaration of function 'prctl' in bluedroid."
Elliott Hughes [Sat, 19 Jul 2014 00:07:51 +0000 (17:07 -0700)]
Fix implicit declaration of function 'prctl' in bluedroid.
Change-Id: I288dd19bd478a3ff716d4f7f4179cc2b7574473a
Michael Wright [Thu, 17 Jul 2014 21:45:58 +0000 (14:45 -0700)]
Fix string format error for 64-bit builds
Change-Id: Idefad9d9ea3a54f7f412e80c4998137d15a1b23c
Elliott Hughes [Sat, 19 Jul 2014 00:11:17 +0000 (00:11 +0000)]
Merge "Fix implicit declaration of function 'prctl' in bluedroid." into lmp-dev
Elliott Hughes [Sat, 19 Jul 2014 00:07:51 +0000 (17:07 -0700)]
Fix implicit declaration of function 'prctl' in bluedroid.
(cherry picked from commit
d356ffbf6f6095489c73266e6e591b1167cfa5e6)
Change-Id: Icc160c758c126e48fd6490cd14211a8685e4cdba
Mike J. Chen [Mon, 21 Jul 2014 17:22:28 +0000 (17:22 +0000)]
Merge "Make auto connect work for multiple known BLE devices" into lmp-dev
Mike J. Chen [Sat, 19 Jul 2014 00:40:12 +0000 (17:40 -0700)]
Make auto connect work for multiple known BLE devices
Due to a bug with wl_state not ever setting WL_INIT,
auto connect was not working for more than one known
BLE device after a reboot. The fix is to set the WL_INIT
flag when in initiator state.
I also added code to set the WL_SCAN flag when in
scanning state. Not sure if that fixes any bug but
it looks like it should have been done too.
WL_ADV was the only state flag previously being set.
Bug
16404692
Change-Id: Id42907c0d8301e347e603684e2c03e4905bfec49
Signed-off-by: Mike J. Chen <mjchen@google.com>
Sharvil Nanavati [Thu, 17 Jul 2014 21:24:30 +0000 (21:24 +0000)]
Merge "A simple, thread-safe timer API for bluedroid." into lmp-dev
Sharvil Nanavati [Thu, 17 Jul 2014 21:00:17 +0000 (21:00 +0000)]
Merge "Revert "Revert "Clean up messy dispatch in bt_hci_bdroid by using new primitives.""" into lmp-dev
Sharvil Nanavati [Thu, 17 Jul 2014 07:53:01 +0000 (00:53 -0700)]
Revert "Revert "Clean up messy dispatch in bt_hci_bdroid by using new primitives.""
Original code broke the build for razor-eng, updated the code to fix break.
This reverts commit
dd29f036a8cde94b3c296fb08ee3e9b2d65c15e0.
Change-Id: I2d2f9b5b51b923e3f0e8092b3169ea447193887d
Sharvil Nanavati [Wed, 2 Jul 2014 01:42:56 +0000 (18:42 -0700)]
A simple, thread-safe timer API for bluedroid.
Change-Id: I5fa21b48506e4d1d65da4b8bedbbf39e03dad559
Glenn Kasten [Thu, 17 Jul 2014 15:18:33 +0000 (15:18 +0000)]
Merge "Add audio_input_flags_t to HAL open_input_stream" into lmp-dev
Glenn Kasten [Thu, 17 Jul 2014 14:33:51 +0000 (07:33 -0700)]
Add audio_input_flags_t to HAL open_input_stream
Change-Id: I5023c0fdb8069668ca2b84096277d6abdbf7d729
Andre Eisenbach [Thu, 17 Jul 2014 01:59:17 +0000 (01:59 +0000)]
Merge "Fix GKI_add_to_timer_list to handle middle-of-list insertions correctly" into lmp-dev
Andre Eisenbach [Thu, 17 Jul 2014 01:35:56 +0000 (18:35 -0700)]
Fix GKI_add_to_timer_list to handle middle-of-list insertions correctly
The newly added timer_list code didn't handle middle-of-list insertions
correctly, leading to problems pairing certain Bluetooth devices as well
as causing 100% CPU usage for the Bluetooth task.
Change-Id: I3d4c22b775a91da2a3f983e8c78facbd91d4cb7d
Svetoslav Ganov [Thu, 17 Jul 2014 00:26:24 +0000 (00:26 +0000)]
Revert "Clean up messy dispatch in bt_hci_bdroid by using new primitives."
This change broke the build. Reverting to unblock people waiting for a green build to start working.
This reverts commit
3f9fbe74c1d6e774d3f21275515c7b895715aec5.
Change-Id: I58c3bdcc2f5f3fe744b8d3f80753566cf1d22bd1
Sharvil Nanavati [Sun, 6 Jul 2014 04:21:38 +0000 (21:21 -0700)]
Clean up messy dispatch in bt_hci_bdroid by using new primitives.
Instead of dispatching onto a worker thread by setting bits of a
bitfield and then having the thread pull data from shared data
structures, this code uses the previously defined primitives to
write to a synchronized thread event queue. It's advantageous because
it's more direct dispatch (you specify which function you want to
call on the worker thread instead of mapping bitfields to a function),
it avoids a lot of boilerplate code, function calls have predictable
ordering, and it uses generic infrastructure instead of building a
custom dispatch + synchronized data strucures.
Change-Id: If938e4fd47c8ddf328a29d104151f900ec659588
Sharvil Nanavati [Sat, 5 Jul 2014 00:51:29 +0000 (17:51 -0700)]
Extend the threading library to back thread with an event queue.
This change allows arbitrary functions to be called on a given
thread which will clean up much of the dispatch code in bluedroid.
Looking forward, this code will be extended to allow additional objects
and queues to be attached to a thread for more customizable dispatch.
Change-Id: Id3a16256c264e3d35e6db5a562cb0e7762676457
Sharvil Nanavati [Fri, 4 Jul 2014 23:33:37 +0000 (16:33 -0700)]
Expose enqueue/dequeue file descriptors for fixed_queue.
These file descriptors can be used with a reactor to perform
non-blocking enqueue/dequeue operations.
Change-Id: If75730f9093e8d20a789a7bd2bde92e019922e5a
Sharvil Nanavati [Tue, 15 Jul 2014 22:18:12 +0000 (15:18 -0700)]
Eliminate last_ticks from TIMER_LIST_ENT.
It's unnecessary, potentially calculated incorrectly, and the insertion
logic that depended on it was fragile. I've rewritten the list
insertion routine so it's easier to follow. This should also fix
http://b/
16259295.
Change-Id: Ib7184c94c495c03d3acbe105955b1bb712dbbfaa
(cherry picked from commit
a1bfd3ee95378fab78c931c3360cfbd16de3b617)
Andre Eisenbach [Sat, 12 Jul 2014 01:18:05 +0000 (01:18 +0000)]
Merge "Calculate A2DP frames to send based on elapsed time"
Andre Eisenbach [Fri, 11 Jul 2014 23:57:24 +0000 (16:57 -0700)]
Calculate A2DP frames to send based on elapsed time
This patch is aimed at improving A2DP audio quality by sending the
correct number of frames based on the actual time elapes between "ticks"
in order to account for timer drift.
Change-Id: If5b7cde90f5eb10b926ad247f51cff0eb60bbff7
Mike Lockwood [Fri, 11 Jul 2014 19:05:04 +0000 (12:05 -0700)]
A2DP: Fix audio stuttering in A2DP sink mode
Change-Id: Ied821aeb14f83e3fd1daa6e175ac995abbfbb198
Mike J. Chen [Sat, 12 Jul 2014 00:57:15 +0000 (00:57 +0000)]
Merge "Fix GKI buffer leak with discovery information service reading"
Mike J. Chen [Sat, 28 Jun 2014 02:01:10 +0000 (19:01 -0700)]
Fix GKI buffer leak with discovery information service reading
If the discovery information service of the LE client has
the fields model number, serial number, fw version, etc,
the service would allocate PKI buffer and never do anything
with it, so it would leak. It looks like it should have
been assigned the a callback string array, however fixing
that still doesn't fix the leak because the code that receives
the string array, bta_hh_le_dis_cback(), never uses it and
never frees it.
I believe the semantic is that the string arrays are kept around
as a cache in the srvc engine connection structure,
so it's the srvc engine dealloc of the callback structure that
needs to also free the string buffers if they have been allocated.
After fixing the string array allocation, add code to free the
string array entries if they are not null.
Also fixed an off by one error in DIS_SrUpdate() that would also lead
to a GKI buffer leak.
Improve two string termination cases to use a simple set of the
last entry in the char array instead of memsetting the whole array
when most of it will be filled by a following memcpy.
Change-Id: I7905cd771dbbe166e3c2b42e019bac9f5a312877
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mike J. Chen [Tue, 1 Jul 2014 19:41:02 +0000 (12:41 -0700)]
Fix deadlock and non-working socket msg throttling
Two major bugs in btif_config.c. One is that due to improper
locking order, a deadlock could occur (symptom is generally
out of GKI buffers because BTIF thread stops processing it's
mailbox because it is blocked sending a msg to the socket
thread, which in turn is blocked because BTIF is holding
the lock it needs to do the config save that BTIF requested
in the first place).
The other is also lock related. The mechanism to throttle
socket messages based on whether there was one already
in flight wasn't working because there wasn't locking
when that variable was being used. The compiler would be
free to cache it in a register on SMP machines, so it would
never look like there as a value in flight. This would
cause a bunch of messages to be queued up, and then the
way the handling worked in cfg_cmd_callback(), every
cmd would cause a 3 second sleep, even if there was nothing
to do. Modified the loop to check if there was nothing
to do before sleeping.
I was running into both bugs when repeatedly pairing and
unpairing a BLE device. The deadlock would hit first, causing
out of GKI buffers. Once I fixed the deadlock, I would still
run out of GKI buffers because the socket thread wasn't working
fast enough to clear the backlog of socket messages it had
received.
Also optimized some string termination code which was using
a memset of the full buffer before and then copying over
every entry except the last. Now we do the copy and just
set the last buffer entry to null.
Change-Id: Ic06ef0b8e15d8f1fe669fb88439851ffbad560de
Signed-off-by: Mike J. Chen <mjchen@google.com>
Nitin Arora [Fri, 11 Jul 2014 01:40:18 +0000 (01:40 +0000)]
am
02d9b7b4: Bluetooth: Increase number of allowed notifications
* commit '
02d9b7b41f1fcf21e798a4c0aabde89f00729d08':
Bluetooth: Increase number of allowed notifications
Nitin Arora [Fri, 11 Jul 2014 01:40:17 +0000 (01:40 +0000)]
am
7475a509: Bluetooth: Adds SMP response timer for security request
* commit '
7475a5098339d763aa6e3a0374ee2f1c16e002c4':
Bluetooth: Adds SMP response timer for security request
Priti Aghera [Fri, 11 Jul 2014 01:40:17 +0000 (01:40 +0000)]
am
156c52bb: Send correct status for SMP AUTH failure
* commit '
156c52bb003a14147db99d8a151edc08f591bd34':
Send correct status for SMP AUTH failure
Nitin Arora [Thu, 9 Jan 2014 22:27:25 +0000 (14:27 -0800)]
Bluetooth: Increase number of allowed notifications
This change increase the maximum number of notifications
that can be registered for LE remote devices.
This count is increase from 7 to 15.
Change-Id: I422704e9bae69c48b731757526ed9ee4055aa643
Nitin Arora [Fri, 21 Feb 2014 02:52:41 +0000 (18:52 -0800)]
Bluetooth: Adds SMP response timer for security request
This adds timer to cancel security request from remote if there
is no response from user for pairing popup.
Change-Id: I18694dcc5275a1eb10de4ad921b6baca189b42fa
Mike J. Chen [Sat, 12 Jul 2014 00:57:09 +0000 (00:57 +0000)]
Merge "Fix deadlock and non-working socket msg throttling"
Mike J. Chen [Tue, 1 Jul 2014 19:15:12 +0000 (12:15 -0700)]
Fix GKI buffer leak in GATT event handling
The GATT event handler was telling the BTA dispatcher that
it would always free the GKI msg buffers itself, but in fact
this wasn't true. There were some cases where the buffer is
queued and freed later (queued in p_clcb->p_q_cmd for later
access and freeing), but many times the event handlers
(like bta_gattc_ci_save()) don't queue the buffer and don't
free it, causing a GKI buffer leak.
Also, prevent a double free case (not certain it happens, but
in theory it could) if bta_gattc_sm_execute() queues a buffer
in bta_gattc_disc_cmpl().
Lastly, remove held flag since it's redundant with whether
p_q_cmd is null or not. Just go with one source of truth and
not have one shadow the other.
Change-Id: I1bd43919b8a2e125076e26cd6a3a08480b3e7e2d
Signed-off-by: Mike J. Chen <mjchen@google.com>
Priti Aghera [Wed, 9 Jul 2014 21:58:19 +0000 (14:58 -0700)]
Send correct status for SMP AUTH failure
Send correct corresponding status for SMP AUTH failure to JAVA layer.
This will enable BluetoothEventManager to display correct error message
for bond state changed callback.
Bug
15677623
Change-Id: I6a8742926bac862f960890417b5d68c23b33e010
Andre Eisenbach [Wed, 9 Jul 2014 21:35:39 +0000 (21:35 +0000)]
Merge "Fix GKI timers to take execution time into account"
Andre Eisenbach [Mon, 7 Jul 2014 18:29:34 +0000 (11:29 -0700)]
Fix GKI timers to take execution time into account
Previously, the GKI timer system would not take the time taken for
updating the timers into account when re-scheduling the next timer. This
would by design introduce timer drift into the system.
This patch measures the time taken for an alarm to be triggered to
report the correct number of ticks to the GKI timer subsystem, as well
as measuring the time taken for updating the timers to adjust the next
alarm accordingly.
This patch dramatically improves A2DP audio quality on various devices
which currently suffer timer drift problems.
Change-Id: Ia99454abcb2a6889c47b1d8e267705f29ebe7b64
Sharvil Nanavati [Sun, 6 Jul 2014 04:31:25 +0000 (21:31 -0700)]
Add template doc for Android properties used by bluedroid.
Change-Id: Idafbaa69161a7fa01a381d9b4fc5d9f41bc5695f
Andre Eisenbach [Wed, 9 Jul 2014 17:03:00 +0000 (17:03 +0000)]
Merge "Prevent A2DP bit pool calculation endless loops."
Sharvil Nanavati [Sun, 6 Jul 2014 03:42:07 +0000 (20:42 -0700)]
Expose semaphore's file descriptor.
|semaphore_get_fd| can be used by callers to determine if it's safe
to call |semaphore_wait| and |semaphore_post| without blocking.
Change-Id: Icf758f03ea2aa85cddcb4ab3f7906b2c587fb8ac
Sharvil Nanavati [Thu, 8 May 2014 05:09:12 +0000 (22:09 -0700)]
Start of threading library
So far it's a thin shim around pthreads which allows setting thread
name and querying tids from any thread.
Change-Id: Id156f662778806a54a8a302be424ee051fac4710
Andre Eisenbach [Tue, 8 Jul 2014 19:33:38 +0000 (12:33 -0700)]
Prevent A2DP bit pool calculation endless loops.
This prevents log spam and endless loops in the A2DP bit pool
calculation. Protecting against the endless loop with prevent battery
draining issues and phone unresponsiveness.
This patch addresses the symptom. A separate patch will be submitted
once root cause is determined to address the problem.
Change-Id: I045b724c1c1638551b9333249f39eee109fa9ba1
lungtsai_lin [Wed, 2 Jul 2014 12:39:02 +0000 (20:39 +0800)]
Bluetooth: Rename BTA_AVK_INCLUDED flag to BTA_AV_SINK_INCLUDED (bt_target.h)
Now OEM could enable/disable A2DP SINK role
Change-Id: I62cf17b0397a86c5f886a2c1ca724ca77a7f9bd4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Matthew Xie [Sat, 5 Jul 2014 19:50:41 +0000 (19:50 +0000)]
Merge "DO NOT MERGE: Send to local UUID for AV connection" into klp-wireless-dev
Sharvil Nanavati [Mon, 23 Jun 2014 23:30:46 +0000 (16:30 -0700)]
Implement the reactor pattern in C.
This code will form the basis of most select-based event loops in
bluedroid. It provides a thread-safe abort routine and a separation
between the dispatcher and event handler code.
Change-Id: I6f1c033d18f045ba273187dab607c209dfe32d30
Ravi Nagarajan [Wed, 2 Jul 2014 10:15:34 +0000 (03:15 -0700)]
DO NOT MERGE: Send to local UUID for AV connection
BTA expects local UUID to be passed into BTA_AvOpen. The value of source/sink
was reversed in the btif layer thus causing connection failure
bug
15837817
Change-Id: If159ac0491afcb75659336c98caba3cefe71ee7b
Wei Wang [Wed, 2 Jul 2014 19:05:46 +0000 (19:05 +0000)]
Merge "Code cleanup - remove unnecessary commented out code" into klp-wireless-dev
Wei Wang [Wed, 2 Jul 2014 18:34:08 +0000 (11:34 -0700)]
Code cleanup - remove unnecessary commented out code
Change-Id: I86e78d1b0470b9fda7455ae8ef5788814cf5c780
Eric Laurent [Sun, 6 Jul 2014 17:07:59 +0000 (17:07 +0000)]
Merge "audio: deprecate audio_stream_frame_size()"
Matthew Xie [Sat, 5 Jul 2014 19:53:58 +0000 (19:53 +0000)]
am
85b4ee5d: (-s ours) Merge "DO NOT MERGE: Send to local UUID for AV connection" into klp-wireless-dev
* commit '
85b4ee5df4208fd06e836f40d7a19a84545f4e93':
DO NOT MERGE: Send to local UUID for AV connection
Eric Laurent [Thu, 3 Jul 2014 23:09:53 +0000 (16:09 -0700)]
audio: deprecate audio_stream_frame_size()
Bug:
15000850.
Change-Id: I1edcc78561cdc328ae0d91a1d07b0836ca5e1715
Narayan Kamath [Thu, 3 Jul 2014 10:48:20 +0000 (11:48 +0100)]
Fix signed - unsigned comparison in bluedroid test.
Change-Id: I702e9406a31424f27de2b600cb55c92e255917dd
Sharvil Nanavati [Thu, 3 Jul 2014 06:35:53 +0000 (06:35 +0000)]
am
19084c62: Implement the reactor pattern in C.
* commit '
19084c6242d8ddb366a52eba5084c974280cce0f':
Implement the reactor pattern in C.
Wei Wang [Wed, 2 Jul 2014 19:09:15 +0000 (19:09 +0000)]
am
b3c61229: Merge "Code cleanup - remove unnecessary commented out code" into klp-wireless-dev
* commit '
b3c61229ccf38ea3f398f93902d348ba12a7fb07':
Code cleanup - remove unnecessary commented out code
Matthew Xie [Wed, 2 Jul 2014 07:36:33 +0000 (07:36 +0000)]
am
a92c04f2: (-s ours) DO NOT MERGE Fix compilation issue
* commit '
a92c04f2dbd7f88853d6380d66c1f4d200674f97':
DO NOT MERGE Fix compilation issue
Matthew Xie [Wed, 2 Jul 2014 06:50:46 +0000 (12:20 +0530)]
DO NOT MERGE Fix compilation issue
This patch fixes broken compilation on KWD branch
Change-Id: I9a1da11e33e938910dc556ed3e015bd3456e21ef
Sharvil Nanavati [Wed, 2 Jul 2014 07:13:07 +0000 (00:13 -0700)]
Fix build: change macro call from _DEBUG0 to _DEBUG.
Change-Id: Iacbf4c33a7b690e2065471b85a6a4d82dd4a7fca
Matthew Xie [Wed, 2 Jul 2014 06:29:09 +0000 (06:29 +0000)]
am
23ae7c52: Merge "Added code to reuse the signal fds and avoid fd close" into klp-wireless-dev
* commit '
23ae7c526b529cf1c76c4a4cc8a341545493404d':
Added code to reuse the signal fds and avoid fd close
git-zhenye.broadcom.com [Wed, 2 Jul 2014 06:29:09 +0000 (06:29 +0000)]
am
359895ef: Fixed deadlock issue for concurrent multiple rfcomm connections.
* commit '
359895efb36a7e4f65fbcc9a28221b6ede44aadd':
Fixed deadlock issue for concurrent multiple rfcomm connections.
Sharvil Nanavati [Wed, 2 Jul 2014 00:11:24 +0000 (17:11 -0700)]
Use POSIX timer for non-wake alarms in bluedroid.
After this change, bluedroid will go through AlarmManager for wake
alarms (>= 3s) and POSIX timers + wake lock for short deadlines.
This change allows A2DP to continue streaming while the screen is
off.
Change-Id: I56622a6873aa431842dd1d97e830849ac2fe6773
Sharvil Nanavati [Mon, 30 Jun 2014 01:10:15 +0000 (18:10 -0700)]
Remove more unused code from GKI timers.
Change-Id: I4fc3a64312b49a3dd23d80454244f8eb6340d8e6
Sharvil Nanavati [Mon, 30 Jun 2014 00:36:56 +0000 (17:36 -0700)]
Remove more unused code from GKI.
Specifically:
- ISR code (since bluedroid is entirely userspace)
- logging macros
- newlines in log macros
- GKI_get_time_stamp (unused function)
- GKI_freeze
- unused timer variables and macros
Change-Id: I8e0676c28842d87c4148059ebb0320367658bc16
Mike Lockwood [Wed, 2 Jul 2014 02:21:30 +0000 (19:21 -0700)]
Fix problem with A2DP initialization due to merge error
btif_av_init() would fail when called a second time due to
erroneous nulling of btif_av_cb.sm_handle
Bug:
16014877
Change-Id: I7e6b213759e93372ac8ecaadc2b81452572f3f7d
Matthew Xie [Wed, 2 Jul 2014 06:28:12 +0000 (06:28 +0000)]
Merge "Added code to reuse the signal fds and avoid fd close" into klp-wireless-dev
git-zhenye.broadcom.com [Fri, 20 Jun 2014 00:28:53 +0000 (17:28 -0700)]
Added code to reuse the signal fds and avoid fd close
Bug
15436535
Change-Id: Ica5b1915dd94699eb19c57b6904154493b0cc08c
git-zhenye.broadcom.com [Thu, 12 Jun 2014 23:52:46 +0000 (16:52 -0700)]
Fixed deadlock issue for concurrent multiple rfcomm connections.
Bug
15469934
Change-Id: I77a3dc97c92f0ccd5764220e8e0bf5c0689d7b12
Hemant Gupta [Fri, 18 Apr 2014 07:24:08 +0000 (12:54 +0530)]
Bluetooth: Support MAP Client role on Bluedroid.
Implementation changes from BTA and BTIF layer to support
MCE role on Bluedroid stack.
Change-Id: I8547b0f28338e83edabae969121872ca23fdcb36
Mike Lockwood [Tue, 1 Jul 2014 03:30:09 +0000 (20:30 -0700)]
Fix audio HAL build (make it a shared library again)
Bug:
15978121
Change-Id: I23ba30f27b73b48a1d9128d294641367bfffa810
Satya Calloji [Tue, 1 Jul 2014 01:08:03 +0000 (01:08 +0000)]
am
7ae3f9ee: LE Onfound and Onlost feature
* commit '
7ae3f9eebc4e930d51e6b61f845ffd0f9a8cb9f8':
LE Onfound and Onlost feature
Satya Calloji [Tue, 1 Jul 2014 01:08:03 +0000 (01:08 +0000)]
am
5e177043: (-s ours) LE ADV Filter changes
* commit '
5e177043e3dfcd70676761a40425179d16c4a7ce':
LE ADV Filter changes
Richie Hsieh [Thu, 17 Apr 2014 14:39:31 +0000 (22:39 +0800)]
Add BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED
Added CleanSpec.mk change
Signed-off-by: Richie Hsieh <richie.hsieh@mediatek.com>
Change-Id: Ice2a514f3d24859dbf091aae30e5c8781e90b7fd
(cherry picked from commit
d343338cb4c42e62ac97c451bc23fb36d9b58d3f)
Satya Calloji [Tue, 1 Jul 2014 01:02:50 +0000 (01:02 +0000)]
am
b9b1f4e7: (-s ours) LE batch scan feature
* commit '
b9b1f4e7a5cc96c57873a991f4ea3c3c08934c26':
LE batch scan feature
Satya Calloji [Sun, 15 Jun 2014 06:16:18 +0000 (23:16 -0700)]
LE Onfound and Onlost feature
BTIF and stack layer changes for onfound/onlost feature
DO NOT MERGE
Change-Id: Id52cdd5855ca8c0ff276b42613b51c4cd3882bfc
Satya Calloji [Thu, 5 Jun 2014 20:15:15 +0000 (13:15 -0700)]
LE ADV Filter changes
BTIF and stack layer changes for ADV filter feature
DO NOT MERGE
Change-Id: I865e57c41802751e172248547b8510598261ec94
Satya Calloji [Sun, 11 May 2014 06:46:24 +0000 (23:46 -0700)]
LE batch scan feature
BTIF and stack changes for batch scan feature
DO NOT MERGE
Change-Id: I4dd2d551435e9f1f0e43906bd695294e97ed4bba
Matthew Xie [Mon, 30 Jun 2014 22:37:13 +0000 (22:37 +0000)]
am
66432dcf: Add WBS support on Bluedroid (2/6)
* commit '
66432dcffe211e317d35978283a04a96d5620bdf':
Add WBS support on Bluedroid (2/6)
Matthew Xie [Sun, 27 Apr 2014 12:45:32 +0000 (05:45 -0700)]
Add WBS support on Bluedroid (2/6)
Bug
13764086
Change-Id: I12bf302f7dd19efb497ad49d4d1d638a7a926049
Satya Calloji [Sun, 15 Jun 2014 06:16:18 +0000 (23:16 -0700)]
LE Onfound and Onlost feature
BTIF and stack layer changes for onfound/onlost feature
Change-Id: Id52cdd5855ca8c0ff276b42613b51c4cd3882bfc
Satya Calloji [Thu, 5 Jun 2014 20:15:15 +0000 (13:15 -0700)]
LE ADV Filter changes
BTIF and stack layer changes for ADV filter feature
Change-Id: I865e57c41802751e172248547b8510598261ec94
Satya Calloji [Sun, 11 May 2014 06:46:24 +0000 (23:46 -0700)]
LE batch scan feature
BTIF and stack changes for batch scan feature
Change-Id: I4dd2d551435e9f1f0e43906bd695294e97ed4bba
Nitin Arora [Mon, 30 Jun 2014 19:25:19 +0000 (19:25 +0000)]
am
021e17a6: Clear background conn list entries during BT power off
* commit '
021e17a641e61e3f139717cd755bf6f9b9b9eb12':
Clear background conn list entries during BT power off
Andre Eisenbach [Mon, 30 Jun 2014 19:25:19 +0000 (19:25 +0000)]
am
9279e000: Merge "Bluetooth: Updates background conn list properly during unpair" into klp-wireless-dev
* commit '
9279e0003d43be077d2c2d7a3e5163db960a1150':
Bluetooth: Updates background conn list properly during unpair
Nitin Arora [Thu, 30 Jan 2014 03:18:39 +0000 (19:18 -0800)]
Clear background conn list entries during BT power off
This clears whitelist entries and resets bgconn device lists
Change-Id: I551791d63fa826071c113abd383540838f6c59b2
Richie Hsieh [Wed, 25 Jun 2014 23:32:49 +0000 (16:32 -0700)]
LE: Fix HOGP connection issues caused by incorrect HCI packet flags
Do not set the automatically-flushable packet flag for LE bound HCI
packets (Packet_Boundary_Flag 0b10).
Reported-by: Richie Hsieh <richie.hsieh@mediatek.com>
Change-Id: Id71a096acee70582923e652cfef1f4141b721fed