OSDN Git Service
Dan Shi [Thu, 10 Jan 2019 23:06:50 +0000 (15:06 -0800)]
Add host tests to TEST_MAPPING am:
491407dbad
am:
cbed4516db
Change-Id: I9cf9bfe5cc4e74084eb0712f3636fa25a2a7e783
Dan Shi [Thu, 10 Jan 2019 23:00:45 +0000 (15:00 -0800)]
Add host tests to TEST_MAPPING
am:
491407dbad
Change-Id: I09538ad40d6d5c02f83fe9c870711ebbd7004c1e
Dan Shi [Thu, 10 Jan 2019 18:55:23 +0000 (10:55 -0800)]
Add host tests to TEST_MAPPING
Also added some missing test_suites setting.
Following tests don't have host_supported set to true in Android.bp:
net_test_audio_a2dp_hw
net_test_btif
net_test_btif_profile_queue
net_test_device
net_test_hci
net_test_stack
net_test_stack_ad_parser
net_test_stack_smp
Following tests failed to run in host with error "did not report any run":
net_test_performance
net_test_stack_rfcomm
Bug:
111921389
Test: system/bt$ atest --host :postsubmit
Change-Id: I5f55cead7a2ad1cadea48220f45781f4f74949dd
Jack He [Thu, 10 Jan 2019 05:00:05 +0000 (21:00 -0800)]
Remove code related to Health Device Profile and MCAP Protocol am:
238f8359a9
am:
0f94b1686a
Change-Id: Ic2f7a7297e650869d23944ed34fba183e8bd699b
Jack He [Thu, 10 Jan 2019 04:51:00 +0000 (20:51 -0800)]
Remove code related to Health Device Profile and MCAP Protocol
am:
238f8359a9
Change-Id: Ib10cda753d45163b4d799ca4c1275fb43284c336
Jack He [Fri, 4 Jan 2019 01:11:24 +0000 (17:11 -0800)]
Remove code related to Health Device Profile and MCAP Protocol
* Health Device Profile (HDP) and MCAP protocol has been largely
replaced by BLE. New applications should use Bluetooth Low Energy
instead of legacy Bluetooth Health Device Profile
Bug:
111562841
Test: make, unit test, use Bluetooth
Change-Id: I3da1173a8a928af4b26a29e71746241c22af2236
Merged-In: I3da1173a8a928af4b26a29e71746241c22af2236
(cherry picked from commit
dc13609b58b2f6c6185951f650036f5098e19e92)
Jack He [Wed, 9 Jan 2019 22:21:53 +0000 (14:21 -0800)]
Merge "HCI: Simplify btu_hcif_hdl_command_status()" am:
e5e0a70209
am:
aa97fdca84
Change-Id: I8ed8bc5e8d832931dcf6e3aa6e03ed6ea47309db
Jack He [Wed, 9 Jan 2019 22:16:44 +0000 (14:16 -0800)]
Merge "HCI: Simplify btu_hcif_hdl_command_status()"
am:
e5e0a70209
Change-Id: Icc28b7e93f3f94b82bdbfc7ab923b12b985fdff3
Treehugger Robot [Wed, 9 Jan 2019 21:59:39 +0000 (21:59 +0000)]
Merge "HCI: Simplify btu_hcif_hdl_command_status()"
Stanley Tng [Wed, 9 Jan 2019 17:51:19 +0000 (09:51 -0800)]
Merge "Group all Hearing Aids device information together" am:
89be950b16
am:
4285cebeff
Change-Id: I02646285ae39ac9881c9621d5072c8fea7efaf32
Stanley Tng [Wed, 9 Jan 2019 17:47:12 +0000 (09:47 -0800)]
Merge "Group all Hearing Aids device information together"
am:
89be950b16
Change-Id: I803e04fb6d5f7322eea16aa2f9d3637643a8f00f
Treehugger Robot [Wed, 9 Jan 2019 17:36:40 +0000 (17:36 +0000)]
Merge "Group all Hearing Aids device information together"
Jack He [Wed, 9 Jan 2019 01:48:20 +0000 (17:48 -0800)]
HCI: Simplify btu_hcif_hdl_command_status()
* Move 2nd layer switch statements into top layer
* Check if p_cmd is nullptr at the beginning of the function so
that each case does not need to check it individually. p_cmd
is never null.
* Skip parameter total length at beginning of the function
Test: make, unit test, use Bluetooth for music and calls
Change-Id: I23cf983a1ade44bcea0b1009860efdfaf3b8bca8
Jack He [Wed, 9 Jan 2019 05:25:05 +0000 (21:25 -0800)]
HCI: Fix command status handling of HCI_QOS_SETUP am:
256800be50
am:
33d2d0b460
Change-Id: I207e9b1b1f18626f5ca7d81191ea13812f714465
Jack He [Wed, 9 Jan 2019 05:14:52 +0000 (21:14 -0800)]
HCI: Fix command status handling of HCI_QOS_SETUP
am:
256800be50
Change-Id: I13000c98920ea2b4e7816b47a41352f271af2943
Jack He [Wed, 9 Jan 2019 02:06:12 +0000 (18:06 -0800)]
Remove BTM_SCO_WAKE_PARKED_LINK flag am:
5213da9b4a
am:
0dac6177a5
Change-Id: I064334317d3e1ffa00a77acbfa2e835d3c449c0e
Jack He [Wed, 9 Jan 2019 02:02:03 +0000 (18:02 -0800)]
Remove BTM_SCO_WAKE_PARKED_LINK flag
am:
5213da9b4a
Change-Id: Id7868b58ada9e819fb8cb2fbb93ca5c874d0089d
Jack He [Wed, 9 Jan 2019 01:53:31 +0000 (17:53 -0800)]
HCI: Fix command status handling of HCI_QOS_SETUP
* QOS setup complete event was handled instead of QOS setup command
Test: make
Change-Id: I894099f369675bd25397ee0005c6838f39220eed
Stanley Tng [Fri, 21 Dec 2018 00:44:15 +0000 (16:44 -0800)]
Group all Hearing Aids device information together
A small refactor where the various information about a Hearing Aids
device is gathered into a class. Instead of passing a long list
of function parameters, it is cleaner to group them inside a single
class. It also makes it easier to add new elements in the future.
Test: Manual pair and audio stream with Hearing Aids
Bug:
119617521
Change-Id: I193b5cc915a6c36e7e36d1f06a5adcda7c17ab1c
Jack He [Sat, 5 Jan 2019 00:18:12 +0000 (16:18 -0800)]
Remove BTM_SCO_WAKE_PARKED_LINK flag
* Under majority of configurations, SCO connection can only be created
if in non-parked mode since SCO is a circuit switch link
Bug:
122375953
Test: make
Change-Id: I58569025b435953b964e5aded64b3ace27d4e73c
Jakub Pawlowski [Tue, 8 Jan 2019 02:43:39 +0000 (18:43 -0800)]
Clean up BLE connection state state machine am:
cf7b381ce8
am:
ef8722de04
Change-Id: I407fe4779390d07ab9a276a59941ae887e05a243
Jakub Pawlowski [Tue, 8 Jan 2019 02:39:29 +0000 (18:39 -0800)]
Clean up BLE connection state state machine
am:
cf7b381ce8
Change-Id: Ic045afbd0b7aa44b471b4f8c63c4adc6fab96989
Stanley Tng [Mon, 7 Jan 2019 22:55:28 +0000 (14:55 -0800)]
[automerger skipped] Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev am:
3fd73e4ad2 -s ours am:
af8cf98776 -s ours am:
56e54c0f07 -s ours
am:
4a0e17fd7e -s ours
am skip reason: change_id I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a with SHA1
c1fcbd5508 is in history
Change-Id: I414d07ea8dc28dd9f8ab84ba1a8229042d820768
Stanley Tng [Mon, 7 Jan 2019 22:54:57 +0000 (14:54 -0800)]
[automerger skipped] [automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c am:
47dcb6a458 am:
a2e761ac2b am:
4dc3df74c5 -s ours
am:
d36a3367b9 -s ours
am skip reason: change_id I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a with SHA1
c117a1c951 is in history
Change-Id: Ia31e2b3ca78faf0f211e2b705a6877a5ca9e8564
Stanley Tng [Mon, 7 Jan 2019 22:50:38 +0000 (14:50 -0800)]
[automerger skipped] Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev am:
3fd73e4ad2 -s ours am:
af8cf98776 -s ours
am:
56e54c0f07 -s ours
am skip reason: subject contains skip directive
Change-Id: Id562d02c179dd9299f06d8d09fef15afc94cfb67
Stanley Tng [Mon, 7 Jan 2019 22:50:24 +0000 (14:50 -0800)]
[automerger skipped] [automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c am:
47dcb6a458 am:
a2e761ac2b
am:
4dc3df74c5 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaac7919f35e29539fb245fe26428b9c378861e83
Stanley Tng [Mon, 7 Jan 2019 22:45:06 +0000 (14:45 -0800)]
[automerger skipped] Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev am:
3fd73e4ad2 -s ours
am:
af8cf98776 -s ours
am skip reason: change_id I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a with SHA1
c1fcbd5508 is in history
Change-Id: Ib82a5c8869f17e93969906a55323e43a79628f4a
Stanley Tng [Mon, 7 Jan 2019 22:44:41 +0000 (14:44 -0800)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c am:
47dcb6a458
am:
a2e761ac2b
Change-Id: Ia655d085c410e45e44efc1fa1bb2737a7cccd310
Stanley Tng [Mon, 7 Jan 2019 22:42:23 +0000 (14:42 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
am:
c117a1c951
Change-Id: I9d5b61d1d1d67b083b937ca77037703cf2b15a60
Stanley Tng [Mon, 7 Jan 2019 22:40:43 +0000 (14:40 -0800)]
[automerger skipped] Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev
am:
3fd73e4ad2 -s ours
am skip reason: change_id I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a with SHA1
c1fcbd5508 is in history
Change-Id: Ie17711d48b90d8921cf26dc501cdfb776c7ef47e
Stanley Tng [Mon, 7 Jan 2019 22:40:22 +0000 (14:40 -0800)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c
am:
47dcb6a458
Change-Id: Ief422a38b0c559b912038c038edc48854357b3bf
TreeHugger Robot [Mon, 7 Jan 2019 22:33:36 +0000 (22:33 +0000)]
Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev
Jakub Pawlowski [Wed, 2 Jan 2019 23:41:53 +0000 (00:41 +0100)]
Clean up BLE connection state state machine
* get rid of BLE_DIR_CONN - we never go into this state any more
* BLE_BG_CONN -> BLE_CONNECTING
* use btm_ble_get_conn_st instead of directly accessing control block
Test: compilation
Bug:
112827989
Change-Id: I4aa09a8b558c6f2161806a6d27bee0560fd19fd8
Jakub Pawlowski [Mon, 7 Jan 2019 11:03:18 +0000 (03:03 -0800)]
Move all HCI LE Create Connection management into single file am:
a3580922c4
am:
ee9c5ed4c4
Change-Id: I571bc77f7a85188b0fcb692559a2309678acffd6
Jakub Pawlowski [Mon, 7 Jan 2019 10:59:10 +0000 (02:59 -0800)]
Move all HCI LE Create Connection management into single file
am:
a3580922c4
Change-Id: I96f122540d82b5f564023f3f2ff3d7b1a64b7a47
Jakub Pawlowski [Mon, 31 Dec 2018 11:54:04 +0000 (12:54 +0100)]
Move all HCI LE Create Connection management into single file
Currently handling of LE Create Connection, LE Create Connection
Cancel, LE Connection Complete and other HCI commands related to LE
connection establishment is in two separate files.
Move all this code into single file.
Bug:
112827989
Test: compilation
Change-Id: Ibc2f6ca2324f4df8a23c2722762d0e5297782b33
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
Add check to make sure that data buffer is big enough to read the 2
bytes for length.
Also, fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.
Bug:
120665616
Test: Run the SL4A Test for LE CoC, BleCoCTest
Merged-In: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
Change-Id: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
(cherry picked from commit
fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
(cherry picked from commit
1f1d8b97d80d25023c4c7b04d2aa18d367f4158d)
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
Add check to make sure that data buffer is big enough to read the 2
bytes for length.
Also, fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.
Bug:
120665616
Test: Run the SL4A Test for LE CoC, BleCoCTest
Merged-In: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
Change-Id: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
(cherry picked from commit
fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
(cherry picked from commit
1f1d8b97d80d25023c4c7b04d2aa18d367f4158d)
(cherry picked from commit
6b2739f309f7719086eb8201b3e1a35ba60035f4)
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:29 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c
Change-Id: I92b4d78f5b6a53c863e7ec6d91b4cc32982258f8
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:28 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0
Change-Id: I0cbec621cadfaaf9142d427b52a17cd9db3cd08a
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:27 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88
Change-Id: I9fd0733ff10442ca2050e440b954a9cb2f574c1a
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:26 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31
Change-Id: I40ce009c5868fde902bc29a0af1b62c89f02f158
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:24 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508
Change-Id: I5812786ed1ac013a273e300c1ddbe3fd26857543
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
Add check to make sure that data buffer is big enough to read the 2
bytes for length.
Also, fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.
Bug:
120665616
Test: Run the SL4A Test for LE CoC, BleCoCTest
Merged-In: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
Change-Id: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
(cherry picked from commit
fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
(cherry picked from commit
1f1d8b97d80d25023c4c7b04d2aa18d367f4158d)
(cherry picked from commit
6b2739f309f7719086eb8201b3e1a35ba60035f4)
Jack He [Thu, 3 Jan 2019 18:55:23 +0000 (10:55 -0800)]
Remove BTM_SCO_INCLUDED flag am:
050ef35fde
am:
e83786389b
Change-Id: Ic89d66af8c5a48b6a0b68daec4d9c01df919807a
Jack He [Thu, 3 Jan 2019 18:52:18 +0000 (10:52 -0800)]
Remove BTM_SCO_INCLUDED flag
am:
050ef35fde
Change-Id: Id88e1c8b8e75764ede1b4d869ebaf1af4fb8ff8a
Jack He [Thu, 3 Jan 2019 01:38:53 +0000 (17:38 -0800)]
Remove BTM_SCO_INCLUDED flag
* Instead of removing SCO related code during compilation, platforms
should chose not to call SCO related methods when SCO is not supported
* For example, platforms can choose to not initialize HFP to avoid using
SCO commands
* This CL removes BTM_SCO_INCLUDED compile time flag to simplify code
flow and improve readability
Bug:
122279647
Test: mm -j40; run Bluetooth stack and make phone call
Change-Id: I67d290839091f66c289a428496304c8b3e1dbe21
Jakub Pawlowski [Mon, 31 Dec 2018 15:25:08 +0000 (07:25 -0800)]
Remove connection_manager from gatt namespace am:
f20d94aeb8
am:
bd90b8cc83
Change-Id: Ic9df6a5e09c8643c890d8bc3c76d036444e368de
Jakub Pawlowski [Mon, 31 Dec 2018 15:21:04 +0000 (07:21 -0800)]
Remove connection_manager from gatt namespace
am:
f20d94aeb8
Change-Id: I04df3ae34e992e68297e3704000d7f30c176bcad
Jakub Pawlowski [Fri, 28 Dec 2018 18:03:09 +0000 (19:03 +0100)]
Remove connection_manager from gatt namespace
connection_manager handles more than GATT. Celanup naming.
Bug:
112827989
Test: compilation
Change-Id: Id5fdfacb12921cff04204cf2589f73a7c6a0d01f
Jakub Pawlowski [Fri, 28 Dec 2018 21:29:38 +0000 (13:29 -0800)]
Get rid of is_ble_connecting and ble_connecting_bda am:
23572544ba
am:
5350332903
Change-Id: I5bae17dcc15a1ab3947b60bdf28ffdc390efed98
Jakub Pawlowski [Fri, 28 Dec 2018 21:29:19 +0000 (13:29 -0800)]
Use conneciton_manager for all LE connection establishment am:
ada2b3ee07
am:
3a6c324a44
Change-Id: If96ba1fd4127f97c593dcd768573181c85c5f7db
Jakub Pawlowski [Fri, 28 Dec 2018 21:29:01 +0000 (13:29 -0800)]
Get rid of direct connect queueing logic am:
672d7b1f37
am:
414db3af86
Change-Id: I7b365d7ff3cb2dc6f3b209465c977a7dff8ef1a6
Jakub Pawlowski [Fri, 28 Dec 2018 21:25:05 +0000 (13:25 -0800)]
Get rid of is_ble_connecting and ble_connecting_bda
am:
23572544ba
Change-Id: Ib22fc7e693d9fdf31273b19c0a102aaf8c98bb38
Jakub Pawlowski [Fri, 28 Dec 2018 21:24:53 +0000 (13:24 -0800)]
Use conneciton_manager for all LE connection establishment
am:
ada2b3ee07
Change-Id: I3fd558723f18737fffb0fa7270c306cfd8aed5de
Jakub Pawlowski [Fri, 28 Dec 2018 21:24:41 +0000 (13:24 -0800)]
Get rid of direct connect queueing logic
am:
672d7b1f37
Change-Id: I43fd40bf6cf683843cbae944211b0a6b9430fb01
Jakub Pawlowski [Thu, 27 Dec 2018 20:02:13 +0000 (21:02 +0100)]
Get rid of is_ble_connecting and ble_connecting_bda
These variables make no sense any more, as we might be attempting
multiple connections at the same time.
Test: sl4a GattConnectTest, manual bonding test
Bug:
112827989
Change-Id: I7e1d01e8d80383b49ff9c20fb3758cef03c52882
Jakub Pawlowski [Wed, 19 Dec 2018 21:23:47 +0000 (22:23 +0100)]
Use conneciton_manager for all LE connection establishment
Test: sl4a GattConnectTest, manual bonding test
Bug:
112827989
Change-Id: I55878e03d268c43002e22ce4ebfbf0e334523882
Jakub Pawlowski [Mon, 17 Dec 2018 12:59:54 +0000 (13:59 +0100)]
Get rid of direct connect queueing logic
Instead of queueing requests, we should use whitelist to process the
requests simulteanously.
This patch does remove the queueing logic, succeeding patch will add the
logic to schedule through whitelist.
Test: compilation
Bug:
112827989
Change-Id: Ia7132812f704658ecb6919e52c70b291e6874660
Jakub Pawlowski [Fri, 21 Dec 2018 22:27:22 +0000 (14:27 -0800)]
Call btm_ble_set_conn_st before on_connection_complete am:
a22a78f3b3
am:
e5db0bb3b3
Change-Id: Ida0c13dbf208cc70b32b99ca98ba5636211f6f8c
Jakub Pawlowski [Fri, 21 Dec 2018 22:23:16 +0000 (14:23 -0800)]
Call btm_ble_set_conn_st before on_connection_complete
am:
a22a78f3b3
Change-Id: I97d4f45aa54e6798204e0227c69ac91621294501
Jakub Pawlowski [Fri, 21 Dec 2018 16:16:01 +0000 (17:16 +0100)]
Call btm_ble_set_conn_st before on_connection_complete
on_connection_complete can trigger BTM_WhiteListRemove, which sends
"LE Create Connection Cancel" if the connection is pending.
Make sure connection state is updated before calling on_connection_complete.
Otherwise we send an unnecessary "LE Create Connection Cancel" request.
Bug:
112827989
Test: establish Direct connection with at least one device in the
background connection procedure. Verify HCI snoop log content
Change-Id: I1b8532f4e58d5ab62b471ce0bde6c48640c83ff7
Jakub Pawlowski [Thu, 20 Dec 2018 21:16:23 +0000 (13:16 -0800)]
Merge code in scanner/advertiser connection complete handler am:
c8dfd0fb06
am:
22f2cc7739
Change-Id: I28522473d8da04397996038695685cf67322fd30
Jakub Pawlowski [Thu, 20 Dec 2018 21:16:03 +0000 (13:16 -0800)]
Unify code in scanner/advertiser connection complete handler. am:
b295c481dd
am:
a04440ddf8
Change-Id: I9421fc05a5b8e82894b61a96e275bb59b677f048
Jakub Pawlowski [Thu, 20 Dec 2018 21:12:05 +0000 (13:12 -0800)]
Merge code in scanner/advertiser connection complete handler
am:
c8dfd0fb06
Change-Id: Ibaed9f65f68cedf670ac4f6d9c0f19c36ea45243
Jakub Pawlowski [Thu, 20 Dec 2018 21:11:52 +0000 (13:11 -0800)]
Unify code in scanner/advertiser connection complete handler.
am:
b295c481dd
Change-Id: I000cfd81b6caace4b6046b9a6757c4fc589cb0a4
Jakub Pawlowski [Thu, 20 Dec 2018 18:38:33 +0000 (10:38 -0800)]
Split l2cu_create_conn into two separate, transport-specific functions am:
50a0ec23d7
am:
a29f1fa4d0
Change-Id: I0b87bb407970887c306ce7a5fba64c2abea43b0a
Jakub Pawlowski [Thu, 20 Dec 2018 18:34:22 +0000 (10:34 -0800)]
Split l2cu_create_conn into two separate, transport-specific functions
am:
50a0ec23d7
Change-Id: I01f507afca510252ee1c294e953506b3301a9637
Jakub Pawlowski [Fri, 14 Dec 2018 18:53:59 +0000 (19:53 +0100)]
Merge code in scanner/advertiser connection complete handler
Test: sl4a GattConnectTest
Bug:
112827989
Change-Id: I860693c11c263643858cfa0b4e4deb6a9f231cdd
Jakub Pawlowski [Fri, 14 Dec 2018 18:38:44 +0000 (19:38 +0100)]
Unify code in scanner/advertiser connection complete handler.
btm_ble_set_conn_st is called in every possible scenario of
l2cble_scanner_conn_comp. Call it at start, instead of before each
return.
Test: sl4a GattConnectTest
Bug:
112827989
Change-Id: I969fc59b934dc1c7a52be00741fdf38402545b26
Jakub Pawlowski [Fri, 14 Dec 2018 14:15:54 +0000 (15:15 +0100)]
Split l2cu_create_conn into two separate, transport-specific functions
There is no common logic between LE and BR/EDR paths.
Test: compilation
Bug:
112827989
Change-Id: I507d3a0d8efa0e4936b22722a9c1cc846e0be3bd
Ted Wang [Thu, 20 Dec 2018 06:37:33 +0000 (22:37 -0800)]
Merge "Fix mtu assignment with correct value" am:
55c0aa19be
am:
3aab6fc66f
Change-Id: Ibe77d9c0fa39090520e82bb10b5cde5f068375f2
Ted Wang [Thu, 20 Dec 2018 06:31:27 +0000 (22:31 -0800)]
Merge "Fix mtu assignment with correct value"
am:
55c0aa19be
Change-Id: I3cc2bed544165ee45dbf7646ab13ac4258ce2ab2
Ted Wang [Thu, 20 Dec 2018 06:16:47 +0000 (06:16 +0000)]
Merge "Fix mtu assignment with correct value"
Nick Kralevich [Thu, 20 Dec 2018 00:23:14 +0000 (16:23 -0800)]
Merge "use epoll_create1" am:
b0cbd21cb2
am:
27cbccab96
Change-Id: Ice00312c9a10cde938e9af9198301e80a607cd00
Nick Kralevich [Thu, 20 Dec 2018 00:12:10 +0000 (16:12 -0800)]
Merge "use epoll_create1"
am:
b0cbd21cb2
Change-Id: Ie4a8c3462707aedc9676340ae06487f615e32776
Treehugger Robot [Wed, 19 Dec 2018 23:51:28 +0000 (23:51 +0000)]
Merge "use epoll_create1"
Hansong Zhang [Wed, 19 Dec 2018 22:28:12 +0000 (14:28 -0800)]
Enable BLE background connection when stack is started am:
f91d55816c
am:
5f55b943ec
Change-Id: I4ae9a780c3eaaa80aa6531963e26c0d6cd624c8d
Hansong Zhang [Wed, 19 Dec 2018 22:09:47 +0000 (14:09 -0800)]
Enable BLE background connection when stack is started
am:
f91d55816c
Change-Id: Idc622903ea84149956bcbb13daa0903ab8396e78
Hansong Zhang [Tue, 17 Jul 2018 23:24:24 +0000 (16:24 -0700)]
Enable BLE background connection when stack is started
Remove variable btm_cb.ble_ctr_cb.bg_conn_type. We can enable the
background mode when the Bluetooth stack is started and don't have
to wait until the first background connection request from HID
Device/Hearing Aid/GATT. As soon as we add the first device to white
list, the stack will send HCI Create Connection (White List) command.
Test: manual. Bond to a BLE mouse and turn off/on Bluetooth. Also test
with initiating another direct/white list connection while another white
list connection is pending
Bug:
111562702
Bug:
112827989
Change-Id: I82a476489d181d17aa1c1da8202df1be76928d77
Jakub Pawlowski [Wed, 19 Dec 2018 19:28:23 +0000 (11:28 -0800)]
Revert "Remove redundant GATT_StartIf" am:
b22ea41685
am:
9c0c2868cd
Change-Id: Iea2137dd82bc0d044ac71640503d155e5f1cb517
Jakub Pawlowski [Wed, 19 Dec 2018 19:20:21 +0000 (11:20 -0800)]
Revert "Remove redundant GATT_StartIf"
am:
b22ea41685
Change-Id: I4fba57ad6c2f856109afb74331bdf3e621794899
Jakub Pawlowski [Wed, 19 Dec 2018 12:43:03 +0000 (13:43 +0100)]
Revert "Remove redundant GATT_StartIf"
This change broke initial HID connection.
This reverts commit
cb45b1e380126f300d9f7d89a8382438c5d06cd3.
Stanley Tng [Tue, 18 Dec 2018 21:21:26 +0000 (13:21 -0800)]
Merge "Add stng@google.com to the OWNERS list" am:
efc194ae59
am:
afdb2d2b79
Change-Id: Ica3b1329a7fb88e114d80602731a76fbadb4f1b4
Stanley Tng [Tue, 18 Dec 2018 21:17:20 +0000 (13:17 -0800)]
Merge "Add stng@google.com to the OWNERS list"
am:
efc194ae59
Change-Id: I042d5406886c56f1e7fd2fc52ea46f9c7358a970
Treehugger Robot [Tue, 18 Dec 2018 21:11:28 +0000 (21:11 +0000)]
Merge "Add stng@google.com to the OWNERS list"
Dan Shi [Tue, 18 Dec 2018 19:50:35 +0000 (11:50 -0800)]
Merge "Add a host test for net_test_avrcp" am:
9f3afe4957
am:
6af7f6371a
Change-Id: Ife1c89bd276bd966aff587dc462c1a70f590124d
Dan Shi [Tue, 18 Dec 2018 19:21:54 +0000 (11:21 -0800)]
Merge "Add a host test for net_test_avrcp"
am:
9f3afe4957
Change-Id: Ia2cae467aabd10bd9b713bc8c108ca1c297ca8fa
Treehugger Robot [Tue, 18 Dec 2018 19:05:15 +0000 (19:05 +0000)]
Merge "Add a host test for net_test_avrcp"
Stanley Tng [Tue, 18 Dec 2018 18:14:47 +0000 (10:14 -0800)]
Merge "Make sure Hearing Aids' Connection Intervals is unchanged" am:
be5124ed3d
am:
cbd1f98c02
Change-Id: I38625903f477536fb287f3743d903c64f771e369
Stanley Tng [Tue, 18 Dec 2018 18:05:38 +0000 (10:05 -0800)]
Merge "Make sure Hearing Aids' Connection Intervals is unchanged"
am:
be5124ed3d
Change-Id: I8179c5990b1329874a2f5f3d9d5b926f4708e933
Treehugger Robot [Tue, 18 Dec 2018 17:04:26 +0000 (17:04 +0000)]
Merge "Make sure Hearing Aids' Connection Intervals is unchanged"
Ted Wang [Tue, 18 Dec 2018 02:31:06 +0000 (10:31 +0800)]
Fix mtu assignment with correct value
Assigned mtu value with correspond avct channel configuration
Bug:
120524683
Test: manual
Change-Id: Idb70c678cef1d704e232aef8706082a48b073ef8
Stanley Tng [Tue, 28 Aug 2018 23:06:55 +0000 (16:06 -0700)]
Add stng@google.com to the OWNERS list
Test: N/A
Change-Id: Ic164086fc97fa72aa68ad751b35f339fa71233bb
Nick Kralevich [Mon, 17 Dec 2018 17:09:43 +0000 (09:09 -0800)]
use epoll_create1
epoll_create leaks file descriptors. Use epoll_create1(EPOLL_CLOEXEC)
instead.
Bug:
120983106
Test: compiles and boots
Change-Id: I40abaaea6dad641dc03d141adb29e963e853edc4
Stanley Tng [Fri, 14 Dec 2018 01:31:31 +0000 (17:31 -0800)]
Make sure Hearing Aids' Connection Intervals is unchanged
Make sure that the connection interval of the LE Connection remains the
desired one and reset it if this interval gets changed.
Test: Manual with Hearing Aids device and repeated
connection/disconnection
Bug:
117886712
Change-Id: Id11d1d2e7901bfbbc9c452b94aba968afbc52ee0
Dan Shi [Sat, 15 Dec 2018 01:17:40 +0000 (17:17 -0800)]
Add a host test for net_test_avrcp
Bug:
111921389
Test: atest
Change-Id: I26e4036bb76271ac6181429c904efe0f8b438256
Dan Shi [Sat, 15 Dec 2018 01:16:52 +0000 (17:16 -0800)]
Merge "List test_config_template to android platform only." am:
d41f810b28
am:
b3eff154f2
Change-Id: If44bc52f1dd92076a2c4c7fd3552d4d7c3af2ca0
Dan Shi [Sat, 15 Dec 2018 01:12:41 +0000 (17:12 -0800)]
Merge "List test_config_template to android platform only."
am:
d41f810b28
Change-Id: I131e44269981e905f6d4917f86a906d8dd0edd86
Dan Shi [Sat, 15 Dec 2018 01:03:29 +0000 (01:03 +0000)]
Merge "List test_config_template to android platform only."
OSDN Git Service
