OSDN Git Service
Andre Eisenbach [Fri, 17 Mar 2017 19:28:36 +0000 (19:28 +0000)]
Merge "Abort using SIGABRT instead of SIGKILL on command_timeout" am:
379743d738
am:
7c779ec3a2
Change-Id: I22f28b067828c675ebbfbb98929c8b53be96c598
Andre Eisenbach [Fri, 17 Mar 2017 19:24:55 +0000 (19:24 +0000)]
Merge "Abort using SIGABRT instead of SIGKILL on command_timeout"
am:
379743d738
Change-Id: If9fc37bed4dce4a1b1e0fbde3f81279f0a51fae1
Treehugger Robot [Fri, 17 Mar 2017 19:19:04 +0000 (19:19 +0000)]
Merge "Abort using SIGABRT instead of SIGKILL on command_timeout"
Jakub Pawlowski [Fri, 17 Mar 2017 19:13:45 +0000 (19:13 +0000)]
Divide advertise data when needed am:
331c80117f
am:
d16a438cbf
Change-Id: I9e27e2e6f8e2c80435a3c9e7fa58f4d456f7b623
Jakub Pawlowski [Fri, 17 Mar 2017 19:13:34 +0000 (19:13 +0000)]
Bluetooth 5 Periodic Advertising am:
2d5c21c031
am:
16e2194eff
Change-Id: I192104909fade311733e3f95b16729bae14fb5ff
Jakub Pawlowski [Fri, 17 Mar 2017 19:10:35 +0000 (19:10 +0000)]
Divide advertise data when needed
am:
331c80117f
Change-Id: I2c2b37aa801d286ab4a6fb30cc3b03c543ad97fd
Jakub Pawlowski [Fri, 17 Mar 2017 19:10:23 +0000 (19:10 +0000)]
Bluetooth 5 Periodic Advertising
am:
2d5c21c031
Change-Id: Id03d1690500988ffd4442481837f5a0d57ce5e22
Jakub Pawlowski [Fri, 17 Mar 2017 05:10:32 +0000 (22:10 -0700)]
Divide advertise data when needed
Bug:
30622771
Test: BleAdvertisingManagerTest.test_data_sender
Change-Id: I447fed753b08cef766d99ea8dfa47b1212a9ce03
Jakub Pawlowski [Fri, 17 Mar 2017 00:15:47 +0000 (17:15 -0700)]
Bluetooth 5 Periodic Advertising
This patch implements the initialization of Bluetooth 5 advertising.
Bug:
30622771
Test: manual
Change-Id: If06a6c827f1d8097aa3f019b99ebcb3933742d6c
Andre Eisenbach [Fri, 17 Mar 2017 04:58:53 +0000 (21:58 -0700)]
Abort using SIGABRT instead of SIGKILL on command_timeout
This will produce a stack trace and flag for automated crash reporting.
Bug:
36026072
Test: net_test_bluetooth; device off/on/off tests
Change-Id: I4d4380d61028261ba7bb4599e39993cae1d906a5
Jakub Pawlowski [Fri, 17 Mar 2017 05:26:38 +0000 (05:26 +0000)]
LE Maximum Advertising Data Length (4/4) am:
5a8a162d9e
am:
a41552d319
Change-Id: Id766eabe8e91d82ed71f30c3a3e6ee974bf0ca98
Jakub Pawlowski [Fri, 17 Mar 2017 05:20:08 +0000 (05:20 +0000)]
LE Maximum Advertising Data Length (4/4)
am:
5a8a162d9e
Change-Id: I79f655cddeb49c7b1ac2482a3ae5617954f22706
Jakub Pawlowski [Fri, 17 Mar 2017 01:19:20 +0000 (18:19 -0700)]
LE Maximum Advertising Data Length (4/4)
Add ability to check maximum advertising data length.
Bug:
30622771
Test: manual
Change-Id: I0f3c806046157633f8e2106c1b2700c4277a2b4d
Pavlin Radoslavov [Fri, 17 Mar 2017 04:10:02 +0000 (04:10 +0000)]
Merge "Use the correct tBTA_PAN type when copying the data in a callback" am:
b4939306df
am:
efb75374a7
Change-Id: Ie38e0a2271fcd12603a13fd3fc7308c4d6d2c4f8
Pavlin Radoslavov [Fri, 17 Mar 2017 04:06:02 +0000 (04:06 +0000)]
Merge "Use the correct tBTA_PAN type when copying the data in a callback"
am:
b4939306df
Change-Id: I13409b3cf122f4cee8b3c5f43b6e9bba43f4d24c
Pavlin Radoslavov [Fri, 17 Mar 2017 04:06:02 +0000 (04:06 +0000)]
Use the correct buffer size when copying device inquiry response data am:
ff8011811b
am:
936a99d479
Change-Id: Ifdb892a1f4aaeb6952a6c1f5c9a3b0e242331fae
Pavlin Radoslavov [Fri, 17 Mar 2017 04:02:35 +0000 (04:02 +0000)]
Use the correct buffer size when copying device inquiry response data
am:
ff8011811b
Change-Id: I6f21e24aacfc6736a3f872ec2675812d6bf3c167
Treehugger Robot [Fri, 17 Mar 2017 04:00:31 +0000 (04:00 +0000)]
Merge "Use the correct tBTA_PAN type when copying the data in a callback"
Pavlin Radoslavov [Fri, 17 Mar 2017 02:09:31 +0000 (19:09 -0700)]
Use the correct buffer size when copying device inquiry response data
Bug:
36372989
Test: Running ASAN build
Change-Id: I6016e7609ba24db632222ff4613017e3be30b09c
Pavlin Radoslavov [Fri, 17 Mar 2017 01:54:55 +0000 (18:54 -0700)]
Use the correct tBTA_PAN type when copying the data in a callback
This fixes stack-buffer-overflow issue found using ASAN.
Previously, the original data had type "struct tBTA_PAN_SET_ROLE"
and similar, and eventually "memcpy(..., sizeof(tBTA_PAN))" would
copy data beyond the end of the data buffer.
Bug:
36367964
Test: Running ASAN build
Change-Id: I47210a501378023168a0dd71381e93a5051a4c71
Jakub Pawlowski [Fri, 17 Mar 2017 01:15:20 +0000 (01:15 +0000)]
Bluetooth 5 AdvertisingSet implementation (3/4) am:
16da9217c6
am:
73d1758d48
Change-Id: Ic34f9296fa7583cb4e637cdc616074f365223ff8
Jakub Pawlowski [Fri, 17 Mar 2017 01:09:12 +0000 (01:09 +0000)]
Bluetooth 5 AdvertisingSet implementation (3/4)
am:
16da9217c6
Change-Id: I17188b9a006152507093458e1c3d345a6f5682d5
Jakub Pawlowski [Sun, 12 Mar 2017 00:46:00 +0000 (16:46 -0800)]
Bluetooth 5 AdvertisingSet implementation (3/4)
This patch wires up fist methods of AdvertisingSet, making it possible
to start advertising and stop advertising. It also replaces legacy
implemementation with calls to new implementation.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I843d8fc12ba1928c87e256a0fb6d730c9fa200e6
Jakub Pawlowski [Fri, 17 Mar 2017 00:29:47 +0000 (00:29 +0000)]
Fix net_test_stack_multi_adv am:
8c7d060149
am:
4cd47799f3
Change-Id: I13ef5eadece00fda43dbc4639b094b4c48ac3ad8
Jakub Pawlowski [Fri, 17 Mar 2017 00:26:47 +0000 (00:26 +0000)]
Fix net_test_stack_multi_adv
am:
8c7d060149
Change-Id: I8877d55121300b99db4136f529279891a40cc3bf
Jakub Pawlowski [Thu, 16 Mar 2017 21:47:55 +0000 (14:47 -0700)]
Fix net_test_stack_multi_adv
Change-Id: Ic28aa4a120d973bbf3f05d8022bc2c2e619562e2
Pavlin Radoslavov [Thu, 16 Mar 2017 19:53:08 +0000 (19:53 +0000)]
Fix an HCI race condition when transmitting a packet am:
bc9a9329b3
am:
ad90ac0630
Change-Id: Ia78dabeaa85db0dad8ea1a4d19d777cb10fd1cd4
Pavlin Radoslavov [Thu, 16 Mar 2017 19:49:56 +0000 (19:49 +0000)]
Fix an HCI race condition when transmitting a packet
am:
bc9a9329b3
Change-Id: I070d2bf6f4de8caf35817f40cc1205cc6e943070
Pavlin Radoslavov [Thu, 16 Mar 2017 11:54:21 +0000 (04:54 -0700)]
Fix an HCI race condition when transmitting a packet
There is a race condition when calling
event_command_ready() -> transmit_fragment() -> hci_transmit()
If right after hci_transmit() there is thread context switch
and another thread executes filter_incoming_event() for the same
command, the corresponding packet/command will be taken off the
commands_pending_response list and free()-ed.
However, after the execution on the first thread continues
within transmit_fragment(), the execution logic will continue using
the "packet" that was already free()-ed by the other thread.
To prevent this from happening, the "commands_pending_response_mutex"
within event_command_ready() has to protect the transmit_fragment()
execution and the update_command_response_timer() function right after it.
Also:
* Changed the "commands_pending_response_mutex" to recursive_mutex
* Added "commands_pending_response_mutex" protection in few other
places where "commands_pending_response" itself is used.
Bug:
36205494
Test: Running ASAN build
Change-Id: I63677ad1f2b28683c321631e9e29e4f01628d269
Myles Watson [Wed, 15 Mar 2017 22:39:33 +0000 (22:39 +0000)]
test_vendor: Stop watching before closing the FD am:
01ce9e4233
am:
3f8516d7cc
Change-Id: I5d2fba1b8aa8ba15b1de8d2425c882d6ef550f5e
Myles Watson [Wed, 15 Mar 2017 22:37:02 +0000 (22:37 +0000)]
test_vendor: Stop watching before closing the FD
am:
01ce9e4233
Change-Id: I5c8efd21cfbaf45677a8e29c617852f7f10a768b
Myles Watson [Wed, 15 Mar 2017 19:14:36 +0000 (12:14 -0700)]
test_vendor: Stop watching before closing the FD
Test: net_test_bluetooth BluetoothTest.AdapterRepeatedEnableDisable
Change-Id: I72f5c9105b535ad5a5c41bc15dc9a3ad5f4e023f
Alex Deymo [Wed, 15 Mar 2017 14:21:50 +0000 (14:21 +0000)]
Fix bta_dm_act.cc compile error. am:
7651cfbe6a
am:
3544bacb2a
Change-Id: I7f154b88648845cb930835d11ed79245d8989804
Alex Deymo [Wed, 15 Mar 2017 14:16:20 +0000 (14:16 +0000)]
Fix bta_dm_act.cc compile error.
am:
7651cfbe6a
Change-Id: Ie57643e2919cddb74151d471891c6eed93899103
Alex Deymo [Wed, 15 Mar 2017 07:16:58 +0000 (00:16 -0700)]
Fix bta_dm_act.cc compile error.
When BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE the code fails to compile due
to a missing comma. This was introducted a couple of months ago by
2e8e9f42132d0297a94c0852a1fbf45c9bc348e5 but it went undetected.
This patch simply adds back the missing comma.
Bug:
35804180
Test: `make` on a device with BTM_LOCAL_IO_CAPS set to BTM_IO_CAP_NONE.
Change-Id: I0a924abec4fe6612c5dbb72416123ca391551523
Pavlin Radoslavov [Wed, 15 Mar 2017 06:09:23 +0000 (06:09 +0000)]
resolve merge conflicts of
a3ee2e35 to nyc-dev am:
a33dd28064 am:
b75b8e7f1a am:
d4f1f0e048 am:
0796aaa047
am:
b4e34476e9 -s ours
Change-Id: I5fe69742472d5a419f6757fbb64df0099cf53748
Pavlin Radoslavov [Wed, 8 Mar 2017 02:48:21 +0000 (18:48 -0800)]
Check the HCI length before extracting the L2CAP length and CID
Bug:
34946955
Test: A2DP streaming to a headset
Change-Id: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
(cherry picked from commit
ecc0835114cbae3033d8b0e25bd8b443880d5077)
(cherry picked from commit
33c68c82c1a9c2436d203250ab82f5361ff905b7)
(cherry picked from commit
a4c029c7887d0df70c0d6a884a861eb63d827603)
Pavlin Radoslavov [Wed, 15 Mar 2017 05:58:21 +0000 (05:58 +0000)]
resolve merge conflicts of
a3ee2e35 to nyc-dev am:
a33dd28064 am:
b75b8e7f1a am:
d4f1f0e048
am:
0796aaa047
Change-Id: I216fb8bc48e84793e3c397c60f4311796ce5ef83
Pavlin Radoslavov [Wed, 15 Mar 2017 05:53:21 +0000 (05:53 +0000)]
resolve merge conflicts of
a3ee2e35 to nyc-dev am:
a33dd28064 am:
b75b8e7f1a
am:
d4f1f0e048
Change-Id: Id111ef66d83a3427ccc8272115ef3191221ee3cc
Pavlin Radoslavov [Wed, 15 Mar 2017 05:47:20 +0000 (05:47 +0000)]
resolve merge conflicts of
a3ee2e35 to nyc-dev am:
a33dd28064
am:
b75b8e7f1a
Change-Id: Iab4d37c1e43d62d9132ebf090ac43284f8b668a8
Pavlin Radoslavov [Wed, 15 Mar 2017 05:41:49 +0000 (05:41 +0000)]
resolve merge conflicts of
a3ee2e35 to nyc-dev
am:
a33dd28064
Change-Id: I081f113d8908bb775f56c25beb105a3311b0affb
Pavlin Radoslavov [Tue, 14 Mar 2017 21:46:15 +0000 (14:46 -0700)]
resolve merge conflicts of
a3ee2e35 to nyc-dev
Bug:
34946955
Change-Id: Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4
Merged-In: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
Pavlin Radoslavov [Wed, 15 Mar 2017 01:18:42 +0000 (01:18 +0000)]
Merge "Add a log message in the beginning of function hci_initialize()" am:
e745f573f6
am:
c46a058a2b
Change-Id: Ibbbbba54ea8ce151f4771495453b0db6bf2f412d
Pavlin Radoslavov [Wed, 15 Mar 2017 01:14:12 +0000 (01:14 +0000)]
Merge "Add a log message in the beginning of function hci_initialize()"
am:
e745f573f6
Change-Id: Ia9fa15a85c64c297b911449594b6daf5b8871c0e
Jakub Pawlowski [Wed, 15 Mar 2017 01:09:35 +0000 (01:09 +0000)]
Parse extended advertising packets am:
d6d64b11e1
am:
21c92ccbd7
Change-Id: I9ffa0c57b5bb18d44613e9fb0dcab58a9f68c72f
Treehugger Robot [Wed, 15 Mar 2017 01:08:24 +0000 (01:08 +0000)]
Merge "Add a log message in the beginning of function hci_initialize()"
Jakub Pawlowski [Wed, 15 Mar 2017 01:05:04 +0000 (01:05 +0000)]
Parse extended advertising packets
am:
d6d64b11e1
Change-Id: I05c290d1d441f56eac28ffdff8ed7b4795061dc3
Jakub Pawlowski [Wed, 15 Mar 2017 00:55:52 +0000 (00:55 +0000)]
Add "LE Remove Advertising Set Command" am:
bb858fbf93
am:
9fcca39bcb
Change-Id: I35065a6ce06b53ce453dc1d33dbdd76077718162
Jakub Pawlowski [Wed, 15 Mar 2017 00:50:52 +0000 (00:50 +0000)]
Add "LE Remove Advertising Set Command"
am:
bb858fbf93
Change-Id: I3157d266f0e454bcc46a10b4e7cea9f2018179c9
Jakub Pawlowski [Mon, 13 Mar 2017 23:09:35 +0000 (16:09 -0700)]
Parse extended advertising packets
Test: manual
Bug:
30622771
Change-Id: I286b8d636115385ee5951284629a1894026d9b5b
Pavlin Radoslavov [Sat, 11 Mar 2017 04:51:45 +0000 (20:51 -0800)]
Add a log message in the beginning of function hci_initialize()
Bug:
36043456
Test: Code compilation
Change-Id: Ib588c95a64100f5b2b3567f1bac9fe5e9160e4c0
Jakub Pawlowski [Sun, 12 Mar 2017 00:40:52 +0000 (16:40 -0800)]
Add "LE Remove Advertising Set Command"
Bug:
30622771
Test: manual
Change-Id: Ie0df73475359c69af8df672454fe0c0374523c88
Pavlin Radoslavov [Tue, 14 Mar 2017 21:10:16 +0000 (21:10 +0000)]
Check the HCI length before extracting the L2CAP length and CID am:
33c68c82c1 am:
172f0d8f7c
am:
ca64d3d38b
Change-Id: I239b72b4cc81728c3e859b7f4efcb820c9d8fef9
Myles Watson [Tue, 14 Mar 2017 21:05:18 +0000 (21:05 +0000)]
hci: Stop the thread before hci_close() am:
e986c934fd
am:
af23b6aeb7
Change-Id: Ic39449b6f6551546b5e748e035fb87b5561450f5
Pavlin Radoslavov [Tue, 14 Mar 2017 21:05:16 +0000 (21:05 +0000)]
Check the HCI length before extracting the L2CAP length and CID am:
33c68c82c1
am:
172f0d8f7c
Change-Id: Ifb002936f93d85d635ab76ddf52c0ddb44cb9d3e
Myles Watson [Tue, 14 Mar 2017 20:59:47 +0000 (20:59 +0000)]
hci: Stop the thread before hci_close()
am:
e986c934fd
Change-Id: I639ddc9eb768a260186e06ea03d49c1d2c76f929
Pavlin Radoslavov [Tue, 14 Mar 2017 20:59:46 +0000 (20:59 +0000)]
Check the HCI length before extracting the L2CAP length and CID
am:
33c68c82c1
Change-Id: I1f94530ef90162747ef6a62c3a601856ea1d6672
Pavlin Radoslavov [Wed, 8 Mar 2017 02:48:21 +0000 (18:48 -0800)]
Check the HCI length before extracting the L2CAP length and CID
Bug:
34946955
Test: A2DP streaming to a headset
Change-Id: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
(cherry picked from commit
ecc0835114cbae3033d8b0e25bd8b443880d5077)
Myles Watson [Tue, 14 Mar 2017 18:58:10 +0000 (11:58 -0700)]
hci: Stop the thread before hci_close()
Bug:
36026072
Test: Switch users (toggle Bluetooth under load)
Change-Id: I3fb901b5c47021c708c1fb548858406225065d00
Lakshmipathi K [Mon, 13 Mar 2017 19:55:16 +0000 (19:55 +0000)]
LE Periodic Advertising - advertiser interface am:
8e774d1c53
am:
4cc0683bd3
Change-Id: Ic58562c45d8f9336664afb6d143b94ae90c40c2b
Lakshmipathi K [Mon, 13 Mar 2017 19:50:50 +0000 (19:50 +0000)]
LE Periodic Advertising - advertiser interface
am:
8e774d1c53
Change-Id: I36db1a34639b5cb8deb5ad9a82439ebad15ed038
Lakshmipathi K [Mon, 13 Mar 2017 17:35:12 +0000 (10:35 -0700)]
LE Periodic Advertising - advertiser interface
Bug:
30622771
Test: manual
Change-Id: I358b872c9ffb52f007db4f111520c05b9521aa7f
Jakub Pawlowski [Sat, 11 Mar 2017 02:16:54 +0000 (02:16 +0000)]
Merge "Bluetooth 5 feature check implementation (1/3)" am:
70af00d710
am:
e33a64ca15
Change-Id: Ia91caf0ccae12c4acd46d20b81ded054447063e6
Jakub Pawlowski [Sat, 11 Mar 2017 02:13:22 +0000 (02:13 +0000)]
Merge "Bluetooth 5 feature check implementation (1/3)"
am:
70af00d710
Change-Id: I3a845460853a519ed9d870d579a71ee3fe887f7e
Treehugger Robot [Sat, 11 Mar 2017 02:03:42 +0000 (02:03 +0000)]
Merge "Bluetooth 5 feature check implementation (1/3)"
Myles Watson [Sat, 11 Mar 2017 00:49:07 +0000 (00:49 +0000)]
hci: Close the HAL before cleaning up pending command queue and timers am:
d696e66cad
am:
c6dbb2369b
Change-Id: I4e21148c63befe059f613594e0c2eaaa4f4faa1b
Myles Watson [Sat, 11 Mar 2017 00:45:36 +0000 (00:45 +0000)]
hci: Close the HAL before cleaning up pending command queue and timers
am:
d696e66cad
Change-Id: I5913c210da826c4cebef0b03478afe4f0c49a771
Myles Watson [Fri, 10 Mar 2017 21:08:59 +0000 (13:08 -0800)]
hci: Close the HAL before cleaning up pending command queue and timers
This prevents errors in case of event callbacks being received or timers
being fired after the pending command queue has been deleted.
Bug:
36026072
Test: Turn Bluetooth off/on while scanning and file transfer
Change-Id: I7bb699e929a8b40e42a3543b5445885ae6b1b975
Jakub Pawlowski [Fri, 10 Mar 2017 02:11:43 +0000 (18:11 -0800)]
Bluetooth 5 feature check implementation (1/3)
Wire the new feature check API to actual values received from the
controller.
Test: manual
Bug:
30622771
Change-Id: I2eefb7d5bb00d89ac7ea803191ba05f830080ade
Jakub Pawlowski [Wed, 8 Mar 2017 20:17:16 +0000 (20:17 +0000)]
smp_keys simplification am:
e76a01e1a7
am:
b89568baf4
Change-Id: I3239ecc555586da8f31a8e00b51aaf76cd2e7bee
Jakub Pawlowski [Wed, 8 Mar 2017 20:15:14 +0000 (20:15 +0000)]
smp_keys simplification
am:
e76a01e1a7
Change-Id: I7c7a2f0e2f6c27a135daaa381fca342fe61c4c72
Jakub Pawlowski [Fri, 24 Feb 2017 18:57:57 +0000 (10:57 -0800)]
smp_keys simplification
Test: manual
Change-Id: Ia38604d496b8ae50934c42b68f2424afd1c6320c
Myles Watson [Tue, 7 Mar 2017 02:38:42 +0000 (02:38 +0000)]
hci: Reduce HCI timeout to 2 seconds am:
fb94dc76eb
am:
c3c4158905
Change-Id: I5347fcdd94752b609e944e48aa06a04865c937bf
Myles Watson [Tue, 7 Mar 2017 02:36:12 +0000 (02:36 +0000)]
hci: Reduce HCI timeout to 2 seconds
am:
fb94dc76eb
Change-Id: Ia26374f62252fe1133cb4129906618b6647fc98d
Myles Watson [Mon, 6 Mar 2017 17:07:37 +0000 (09:07 -0800)]
hci: Reduce HCI timeout to 2 seconds
Test: Bluetooth starts/stops, Bluetooth scan works
Change-Id: I4b04d71d57f45956898ff1a99e495195b54f4e8e
Jack He [Thu, 2 Mar 2017 20:46:09 +0000 (20:46 +0000)]
Fix for dual-mode devices advertising with a single address am:
8bf2285959
am:
a6b062d422
Change-Id: Id38e6e39b21f40f83196c76209974bf7ad3d691f
Jack He [Thu, 2 Mar 2017 20:43:38 +0000 (20:43 +0000)]
Fix for dual-mode devices advertising with a single address
am:
8bf2285959
Change-Id: I9b36a3a38f6b7e943dafea354bd32b7730589da5
Jack He [Thu, 16 Feb 2017 08:06:15 +0000 (03:06 -0500)]
Fix for dual-mode devices advertising with a single address
* BTM_ReadRemoteDeviceName checks if a device is connectable over LE before
making a connection. However, when it is not connectable over LE, it could
be connectable over BR/EDR.
* For Dual Mode device, the device type should be 0x3 and is not equal to
BT_DEVICE_TYPE_BREDR, hence we cannot check equality to determine whether
a device is BR/EDR, but need to AND them and check the result.
* btm_ble_read_remote_name() already checks if device is connectable in LE,
and we do not need to do it in BTM_ReadRemoteDeviceName().
* This fix removes the check from BTM_ReadRemoteDeviceName
* This fix also adds error checking to return values of BTM_ReadRemoteDeviceName
* This fix moves inquiry database query to respective remote name
request procedures, as the result of the query is used in those
procedures instead of in BTM_ReadRemoteDeviceName()
Bug:
35348392
Test: make, pair with device that advertise on both LE and BR/EDR
Change-Id: I10d1aa9dd6e2447f9b9d40b1fea9370b5088a57d
Marie Janssen [Thu, 2 Mar 2017 17:11:23 +0000 (17:11 +0000)]
Merge "cleanup: no assigns in conditionals" am:
20d25f4a11
am:
b348392652
Change-Id: I9ad89e2788b4a95e0f896daa8a6530a313e67ad5
Marie Janssen [Thu, 2 Mar 2017 17:08:53 +0000 (17:08 +0000)]
Merge "cleanup: no assigns in conditionals"
am:
20d25f4a11
Change-Id: Id6c9397753e2c971b21c5a08562d8228d6edeb9e
Treehugger Robot [Thu, 2 Mar 2017 17:05:10 +0000 (17:05 +0000)]
Merge "cleanup: no assigns in conditionals"
Bailey Forrest [Wed, 1 Mar 2017 23:00:34 +0000 (23:00 +0000)]
Disable broken unittest am:
042ac33ca2
am:
a334dd605e
Change-Id: Ibf6369cb548e06ed77e7ad98d4c2b2901f19444a
Bailey Forrest [Wed, 1 Mar 2017 22:55:36 +0000 (22:55 +0000)]
Disable broken unittest
am:
042ac33ca2
Change-Id: I133b3c9b8a2df18b1497c0a561bcfdbc7ea4cee6
Bailey Forrest [Wed, 1 Mar 2017 19:49:14 +0000 (11:49 -0800)]
Disable broken unittest
Change-Id: I9c7dbd8dfdb440a31e4c98e93ee533fe96ee7b0e
Pulkit Bhuwalka [Wed, 1 Mar 2017 18:55:50 +0000 (18:55 +0000)]
Allow framework to compile with BTM_IO_CAP_NONE am:
eb1ad1d47b
am:
99baf8d4b6
Change-Id: I6d7b38b0293ed45c5d7bf1494525e952b0c62421
Pulkit Bhuwalka [Wed, 1 Mar 2017 18:53:19 +0000 (18:53 +0000)]
Allow framework to compile with BTM_IO_CAP_NONE
am:
eb1ad1d47b
Change-Id: I082341c0e500cb8bf4e19e2886fbb19cd1d16cfc
Pulkit Bhuwalka [Wed, 1 Mar 2017 00:11:34 +0000 (16:11 -0800)]
Allow framework to compile with BTM_IO_CAP_NONE
Using BTM_IO_CAP_NONE currently causes compilation to fail since
bta_dm_sp_cback ends up unused out a previous #ifdef that only kicks
in if BTM_IO_CAP_NONE is not set. Plugging the entire function into
a #ifdef so consistency is maintained and the framework can compile.
Bug:
35257446
Test: Built locally and run on device. Pairing without display using
JustWorks works.
Change-Id: Ibd7af6454253ccd731ff79602f327a52b8fe585b
Pavlin Radoslavov [Wed, 1 Mar 2017 03:29:34 +0000 (03:29 +0000)]
Merge "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)" am:
435dbce2fe
am:
6c395f881b
Change-Id: Id4a647fc7fc586b6812182ac9ad292ccc6b5113c
Pavlin Radoslavov [Wed, 1 Mar 2017 03:27:34 +0000 (03:27 +0000)]
Merge "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"
am:
435dbce2fe
Change-Id: I9ea3ba4bfb72754e431e56b6ae38e370b9704970
Treehugger Robot [Wed, 1 Mar 2017 03:25:04 +0000 (03:25 +0000)]
Merge "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"
Pavlin Radoslavov [Wed, 1 Mar 2017 02:00:03 +0000 (02:00 +0000)]
Merge "Ignore AAC bitrate from the A2DP Sink device if below a threshold" am:
fc33655f8a
am:
1a3a51a93e
Change-Id: Ic436c8d895cdfec2e54f4a048efd71dda3b6f99c
Pavlin Radoslavov [Wed, 1 Mar 2017 01:55:16 +0000 (01:55 +0000)]
Merge "Ignore AAC bitrate from the A2DP Sink device if below a threshold"
am:
fc33655f8a
Change-Id: I00628b1c1ef6bbafa85ca9f3be79707c80c84e16
Treehugger Robot [Wed, 1 Mar 2017 01:46:28 +0000 (01:46 +0000)]
Merge "Ignore AAC bitrate from the A2DP Sink device if below a threshold"
Myles Watson [Wed, 1 Mar 2017 00:37:04 +0000 (00:37 +0000)]
Merge "btif_sock_thread: Set thread_id = -1 after join" am:
89aea85c7e
am:
183f4b79a8
Change-Id: I18e233bfc2ca15381419aa3d33b02a3f8de80eed
Myles Watson [Wed, 1 Mar 2017 00:35:03 +0000 (00:35 +0000)]
Merge "btif_sock_thread: Set thread_id = -1 after join"
am:
89aea85c7e
Change-Id: I508ffc333a84a53f8aa9e224eff98de68aaec2c1
Treehugger Robot [Wed, 1 Mar 2017 00:28:52 +0000 (00:28 +0000)]
Merge "btif_sock_thread: Set thread_id = -1 after join"
Pavlin Radoslavov [Tue, 28 Feb 2017 23:30:21 +0000 (15:30 -0800)]
Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)
Some devices claim they can handle large MTU and large SBC bitpool.
However, they are struggling and eventually over time they
start delaying the "Rcvd Number of Completed Packets" reports.
Now we always limit the payload MTU to MAX_2MBPS_AVDTP_MTU(663) -
with the overhead of (4 bytes L2CAP Header + 12 bytes AVDTP Header)
such packet can fit within 2-DH5 payload size of 679 bytes.
Bug:
34127145
Test: A2DP SBC streaming to headsets and carkit
Change-Id: I2f32becba703d77d36be46158f68b8a9ef3f299a
Pavlin Radoslavov [Fri, 17 Feb 2017 17:53:52 +0000 (09:53 -0800)]
Ignore AAC bitrate from the A2DP Sink device if below a threshold
Some Sink devices might advertise AAC zero bitrate or a very small
value (e.g., 24576). Ignore values that are below a threshold
(currently set to 64000), because those seem invalid.
For such devices, the actual streaming bitrate will be computed
based on the MTU.
Test: Code compilation
Change-Id: Ibe3de6e53681a618f388b41a01f366ad462b7a1d
Myles Watson [Tue, 28 Feb 2017 23:14:37 +0000 (23:14 +0000)]
Merge "osi: Use atomic_exchange to protect is_joined" am:
8099365eba
am:
edb93b27fb
Change-Id: Id7c553ee372754a6cb11640226c8ff4ff027b9f7
Myles Watson [Tue, 28 Feb 2017 23:12:06 +0000 (23:12 +0000)]
Merge "osi: Use atomic_exchange to protect is_joined"
am:
8099365eba
Change-Id: I62da0426474815a68f7b608953d51714b393af4d