OSDN Git Service

android-x86/system-bt.git
3 years agoRe-log stack/gatt/connection_manager::direct_connect_
Chris Manton [Thu, 24 Sep 2020 00:30:23 +0000 (17:30 -0700)]
Re-log stack/gatt/connection_manager::direct_connect_

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I574c95f79111f06241f7eef97350b996be315915

3 years agoInternal Link stack/gatt/connection_manager::alarm_set_closure
Chris Manton [Thu, 24 Sep 2020 00:29:49 +0000 (17:29 -0700)]
Internal Link stack/gatt/connection_manager::alarm_set_closure

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I2216939ce3c30f2eefed7b93a3ea9306a7926943

3 years agoPrevent le links from setting packet types
Chris Manton [Wed, 23 Sep 2020 17:33:26 +0000 (10:33 -0700)]
Prevent le links from setting packet types

stack/acl/btm_ac::btm_set_packet_types_from_address

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I738e5d12f320f6c10f8c57d10fd5b9a7bd65f08b

3 years agoMove destructor after stack flag in main/shim/::Stack::Stop()
Chris Manton [Wed, 7 Oct 2020 16:05:13 +0000 (09:05 -0700)]
Move destructor after stack flag in main/shim/::Stack::Stop()

Legacy shim acl releases controller resources

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I78ccd0d541f82bfec86180f2c2dd0521af651b6d

3 years agoDynamicChannelImpl::Close check if it's closed first
Hansong Zhang [Thu, 8 Oct 2020 20:07:36 +0000 (13:07 -0700)]
DynamicChannelImpl::Close check if it's closed first

Coule be the case where it's closed, but the client called Close()
before that.

Bug: 167263142
Test: cert/run --host
Tag: #gd-refactor
Change-Id: I5c74081d38e02ece143d7a7ee46606bed83a5f2d

3 years agostack/l2c: Add support for credit based connection oriented channels
Łukasz Rymanowski [Sat, 9 May 2020 00:04:46 +0000 (02:04 +0200)]
stack/l2c: Add support for credit based connection oriented channels

This patch adds only support for LE
There is new L2CAP API to create connection and reconfigure connection.
Implementation will always try to create up to 5 channels if possible.

Tag: #feature
Bug: 159786353
Sponsor: jpawlowski@
Test: compile & manual
Change-Id: I8459a7384ca5771b89b6a5c0bdeeacab86dca5da

3 years agoStreamline stack/acl/btm_acl::BTM_IsAclConnectionUp
Chris Manton [Wed, 7 Oct 2020 22:45:07 +0000 (15:45 -0700)]
Streamline stack/acl/btm_acl::BTM_IsAclConnectionUp

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I25899a6ee5a5b36c2731da3dba83179158ae74bb

3 years agoMerge "Restore LE CoC l2cap conn rsp"
Treehugger Robot [Thu, 8 Oct 2020 23:37:21 +0000 (23:37 +0000)]
Merge "Restore LE CoC l2cap conn rsp"

3 years agoRestore LE CoC l2cap conn rsp
Chris Manton [Thu, 8 Oct 2020 16:33:45 +0000 (09:33 -0700)]
Restore LE CoC l2cap conn rsp

L2cap connection response not generated as server
Plus default config options were not being set

Re: 6613113056bcfd8b8c8abcdc337b15e18f7dfc71

Bug: 170396407
Test: Wireshark shows conn rsp being emitted w/default vals
Test: act -tc BleCocTest
Tag: #refactor
Change-Id: I0f696c2e0bac996ae2b9521fdb282577b9e8528a

3 years agotL2C_TX_COMPLETE_CB_INFO is unused
Hansong Zhang [Fri, 2 Oct 2020 18:26:23 +0000 (11:26 -0700)]
tL2C_TX_COMPLETE_CB_INFO is unused

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5f59b1d3cb903303a76d8e53a189732188d13f56

3 years agoL2cap fixed channel tx complete is unused
Hansong Zhang [Fri, 2 Oct 2020 18:21:58 +0000 (11:21 -0700)]
L2cap fixed channel tx complete is unused

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iae3801999b031c904f048acd3e4c27745938b520

3 years agoMerge changes I61791e5b,If25a7f34,I2949e99a,Ie70a5fec
Treehugger Robot [Thu, 8 Oct 2020 18:25:37 +0000 (18:25 +0000)]
Merge changes I61791e5b,If25a7f34,I2949e99a,Ie70a5fec

* changes:
  Re-log stack/sdp::process_service_search_attr_rsp
  Re-log stack/gatt/gatt_attr::gatt_disc_cmpl_cback
  Re-log stack/smp/smp_act::smp_send_app_cback
  Check power mode only on classic links

3 years agoMerge "Encryption Key size negotiation - PTS tests"
Treehugger Robot [Thu, 8 Oct 2020 16:36:06 +0000 (16:36 +0000)]
Merge "Encryption Key size negotiation - PTS tests"

3 years agoRe-log stack/sdp::process_service_search_attr_rsp
Chris Manton [Wed, 23 Sep 2020 16:27:13 +0000 (09:27 -0700)]
Re-log stack/sdp::process_service_search_attr_rsp

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I61791e5b50d51abdaffc0f9dd6709b94c816e077

3 years agoRe-log stack/gatt/gatt_attr::gatt_disc_cmpl_cback
Chris Manton [Wed, 23 Sep 2020 16:26:49 +0000 (09:26 -0700)]
Re-log stack/gatt/gatt_attr::gatt_disc_cmpl_cback

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: If25a7f34f12bf4283e04655daebddc73b3bb3403

3 years agoRe-log stack/smp/smp_act::smp_send_app_cback
Chris Manton [Wed, 23 Sep 2020 16:27:43 +0000 (09:27 -0700)]
Re-log stack/smp/smp_act::smp_send_app_cback

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I2949e99ad5015082556308965b8cb49387af53f2

3 years agoCheck power mode only on classic links
Chris Manton [Wed, 23 Sep 2020 17:11:30 +0000 (10:11 -0700)]
Check power mode only on classic links

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Ie70a5fecea4909a4755f98b9393843371009a2a3

3 years agoMerge "hci: Fix len of the periodic sync info command"
Treehugger Robot [Thu, 8 Oct 2020 15:14:52 +0000 (15:14 +0000)]
Merge "hci: Fix len of the periodic sync info command"

3 years agohci: Fix len of the periodic sync info command
Łukasz Rymanowski [Thu, 8 Oct 2020 07:48:45 +0000 (07:48 +0000)]
hci: Fix len of the periodic sync info command

Bug: 150670922
Tag: #feature
Test: compile & manual
Sponsor: jpawlowski@
Change-Id: I56065a7b9fcaeff5d3d98e135bed8dfec987ae3b

3 years agoEncryption Key size negotiation - PTS tests
Jakub Pawlowski [Tue, 6 Oct 2020 18:33:30 +0000 (20:33 +0200)]
Encryption Key size negotiation - PTS tests

This is implementation of remaining Encryption Key Size negotiation PTS
tests.

Bug: 142341141
Tag: #gd-refactor
Test: gd/cert/run --host LeSecurityTest:test_min_encryption_key_size_less_than_min
Change-Id: I9ef35d2ef143b076365b956234febbc2ba668c95

3 years agol2cap: Fix missing connection indication
Łukasz Rymanowski [Wed, 7 Oct 2020 14:55:02 +0000 (14:55 +0000)]
l2cap: Fix missing connection indication

Sponsor: jpawlowski
Test: compilation
Change-Id: I42c6dd273527c4420f3466cfd11f8e6c2572e527

3 years agoMerge changes Ie94f7b5a,I7f8cc5a1,I87148e3c
Treehugger Robot [Thu, 8 Oct 2020 08:44:40 +0000 (08:44 +0000)]
Merge changes Ie94f7b5a,I7f8cc5a1,I87148e3c

* changes:
  Add Api stack/acl/::btm_pm_is_le_link
  Re-log stack/acl/btm_acl::lmp_version_below
  Re-log stack/btm/btm_ble::BTM_SetBleDataLength

3 years agoMerge changes I9dee4893,Id30ad44e,I77837cc5,Iebd60d4e,Ie2237ad8, ...
Treehugger Robot [Thu, 8 Oct 2020 08:39:36 +0000 (08:39 +0000)]
Merge changes I9dee4893,Id30ad44e,I77837cc5,Iebd60d4e,Ie2237ad8, ...

* changes:
  Re-log stack/btm/btm_ble::BTM_BleSetPhy
  Use common API to set hci handle
  Add common API to set hci handle
  gd: Add monitor ability to receive packet credits
  Move _process_num_completed_pkts into acl
  Streamline stack/l2cap/l2c_link::l2c_link_process_num_completed_pkts

3 years agoAdd Api stack/acl/::btm_pm_is_le_link
Chris Manton [Wed, 23 Sep 2020 17:10:31 +0000 (10:10 -0700)]
Add Api stack/acl/::btm_pm_is_le_link

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Ie94f7b5a91e75aff552c1686fdd9f143c4337ea2

3 years agoRe-log stack/acl/btm_acl::lmp_version_below
Chris Manton [Wed, 23 Sep 2020 16:08:11 +0000 (09:08 -0700)]
Re-log stack/acl/btm_acl::lmp_version_below

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I7f8cc5a16178e0c1fc88bf31ba1207186bec6d48

3 years agoRe-log stack/btm/btm_ble::BTM_SetBleDataLength
Chris Manton [Wed, 23 Sep 2020 15:50:18 +0000 (08:50 -0700)]
Re-log stack/btm/btm_ble::BTM_SetBleDataLength

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I87148e3c932c671111f5a61f3a178275e9d86804

3 years agoRe-log stack/btm/btm_ble::BTM_BleSetPhy
Chris Manton [Wed, 23 Sep 2020 15:07:55 +0000 (08:07 -0700)]
Re-log stack/btm/btm_ble::BTM_BleSetPhy

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I9dee4893066ed0a80a4dac652d622909a05416fd

3 years agoUse common API to set hci handle
Chris Manton [Tue, 22 Sep 2020 17:40:21 +0000 (10:40 -0700)]
Use common API to set hci handle

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id30ad44e8084effd204f168cf3983da8ab31e064

3 years agoAdd common API to set hci handle
Chris Manton [Tue, 22 Sep 2020 17:18:01 +0000 (10:18 -0700)]
Add common API to set hci handle

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I77837cc51daaca9f89c8b5d83aa84996b2d9e38f

3 years agogd: Add monitor ability to receive packet credits
Chris Manton [Tue, 6 Oct 2020 23:14:55 +0000 (16:14 -0700)]
gd: Add monitor ability to receive packet credits

Primarily used for acl shim

Bug: 166280067
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Iebd60d4e41b45895aed0f7daf60941a1dff2ff59

3 years agoMove _process_num_completed_pkts into acl
Chris Manton [Mon, 5 Oct 2020 20:49:56 +0000 (13:49 -0700)]
Move _process_num_completed_pkts into acl

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: Ie2237ad8b5ed76c024276a5c2db63c0809c680d9

3 years agoStreamline stack/l2cap/l2c_link::l2c_link_process_num_completed_pkts
Chris Manton [Mon, 5 Oct 2020 20:19:24 +0000 (13:19 -0700)]
Streamline stack/l2cap/l2c_link::l2c_link_process_num_completed_pkts

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I1d6072e5f526c7f2ac1b3229c2e4bdbcdbf3d083

3 years agoGD: Enforce link encryption in L2cap
Hansong Zhang [Thu, 1 Oct 2020 19:09:57 +0000 (12:09 -0700)]
GD: Enforce link encryption in L2cap

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: I2cbeeab04ba23c6575f9042fd2785c2c427ce200

3 years agoMerge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ...
Treehugger Robot [Thu, 8 Oct 2020 02:53:20 +0000 (02:53 +0000)]
Merge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ...

* changes:
  Re-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete
  Move btm_ble_increment_link_topology_mask l2c=>btm
  Streamline conditional stack/btm/btm_ble::btm_ble_connected
  enum-ify tL2CAP_LE_RESULT_
  Add api around select fields tL2C_CB::tL2C_LCB::
  enum-ify stack/include/l2c_api::L2CAP_PRIORITY_

3 years agoAVRCP: Advance iterator before deleting it
Hansong Zhang [Wed, 7 Oct 2020 21:50:15 +0000 (14:50 -0700)]
AVRCP: Advance iterator before deleting it

When we invoke instance_->avrc_->Close(), it will invoke the callback in
AcceptorControlCb by the state machine from AVCT, and the iterator will
be deleted. Now we advanece the iterator first.

Bug: 169747177
Test: Connect to a speaker with AVRCP, and turn off Bluetooth
Tag: #stability
Change-Id: If4ed403d355242da48b7ee49dd74784f43de1b1d

3 years agoMerge "shim/l2cap: Fix RegisterLECoc function"
Treehugger Robot [Thu, 8 Oct 2020 00:02:41 +0000 (00:02 +0000)]
Merge "shim/l2cap: Fix RegisterLECoc function"

3 years agoRe-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete
Chris Manton [Tue, 22 Sep 2020 16:08:46 +0000 (09:08 -0700)]
Re-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: Ie0f33c905783981c92b06f5ea5718d49365200af

3 years agoMove btm_ble_increment_link_topology_mask l2c=>btm
Chris Manton [Tue, 22 Sep 2020 02:13:47 +0000 (19:13 -0700)]
Move btm_ble_increment_link_topology_mask l2c=>btm

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I683d68030531bbc635c5f357a8cc356d925d40c8

3 years agoStreamline conditional stack/btm/btm_ble::btm_ble_connected
Chris Manton [Tue, 22 Sep 2020 02:09:34 +0000 (19:09 -0700)]
Streamline conditional stack/btm/btm_ble::btm_ble_connected

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I908ff98f333e173762d25b1e6820db7a433af3af

3 years agoenum-ify tL2CAP_LE_RESULT_
Chris Manton [Mon, 5 Oct 2020 05:44:39 +0000 (22:44 -0700)]
enum-ify tL2CAP_LE_RESULT_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I0a6c26c962277607c5447619d64ce95b47a33311

3 years agoAdd api around select fields tL2C_CB::tL2C_LCB::
Chris Manton [Tue, 6 Oct 2020 17:37:29 +0000 (10:37 -0700)]
Add api around select fields tL2C_CB::tL2C_LCB::

tL2C_CB::tL2C_LCB::link_xmit_quota
tL2C_CB::tL2C_LCB::round_robin_unacked
tL2C_CB::tL2C_LCB::ble_round_robin_unacked
tL2C_CB::tL2C_LCB::acl_priority

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I392dac8bd8fb33cf8350a7fac1d160595c54ed1c

3 years agoenum-ify stack/include/l2c_api::L2CAP_PRIORITY_
Chris Manton [Tue, 6 Oct 2020 17:09:58 +0000 (10:09 -0700)]
enum-ify stack/include/l2c_api::L2CAP_PRIORITY_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I6d0f97493f407f1a4e32bc12434ec5c3c3b8ef54

3 years agoMerge "GD-HCI: Change command and event logs from INFO to DEBUG"
Jack He [Wed, 7 Oct 2020 20:26:59 +0000 (20:26 +0000)]
Merge "GD-HCI: Change command and event logs from INFO to DEBUG"

3 years agoMerge "GD-HCI: Change StopWatch log from INFO to DEBUG"
Jack He [Wed, 7 Oct 2020 20:26:51 +0000 (20:26 +0000)]
Merge "GD-HCI: Change StopWatch log from INFO to DEBUG"

3 years agoMerge "GD-Logging: Add INIT flags to configure debug logging"
Jack He [Wed, 7 Oct 2020 20:25:40 +0000 (20:25 +0000)]
Merge "GD-Logging: Add INIT flags to configure debug logging"

3 years agoshim/l2cap: Fix RegisterLECoc function
Łukasz Rymanowski [Fri, 2 Oct 2020 09:35:38 +0000 (09:35 +0000)]
shim/l2cap: Fix RegisterLECoc function

Change-Id: I6079b1456580f9f49aa18396177e2eef0d9e1398

3 years agoMerge "Implement encryption key size negotiation"
Jakub Pawlowski [Wed, 7 Oct 2020 06:16:54 +0000 (06:16 +0000)]
Merge "Implement encryption key size negotiation"

3 years agoGD: Store peer keys in legacy format
Jakub Pawlowski [Thu, 1 Oct 2020 13:12:25 +0000 (15:12 +0200)]
GD: Store peer keys in legacy format

Bug: 142341141
Tag: #gd-refactor
Test: cert/run --host SecurityRecordStorageTest
Change-Id: I94d270da66977fef6356f011b649bb405d0c4324

3 years agoImplement encryption key size negotiation
Jakub Pawlowski [Mon, 5 Oct 2020 18:29:24 +0000 (20:29 +0200)]
Implement encryption key size negotiation

Bug: 142341141
Tag: #gd-refactor
Test: gd/cert/run --host LeSecurityTest:test_min_encryption_key_size_equal_to_max
Change-Id: I478d29cf20537075ef2a3dc9f707040e0b657ae1

3 years agoMerge "GD-Logging: Change LOG_DEBUG to LOG_INFO"
Jack He [Tue, 6 Oct 2020 22:56:19 +0000 (22:56 +0000)]
Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO"

3 years agoGD-HCI: Change command and event logs from INFO to DEBUG
Jack He [Tue, 6 Oct 2020 22:52:40 +0000 (15:52 -0700)]
GD-HCI: Change command and event logs from INFO to DEBUG

* So that they are not enabled by default

Bug: 164932634
Tag: #gd-refactor
Test: manual testing
Change-Id: I9ff67922b0305cd6397d497dccd038e0444a1d03

3 years agoGD-HCI: Change StopWatch log from INFO to DEBUG
Jack He [Tue, 6 Oct 2020 22:23:28 +0000 (15:23 -0700)]
GD-HCI: Change StopWatch log from INFO to DEBUG

* So that it is disabled by default

Bug: 164973960
Test: manual testing
Tag: #gd-refactor
Change-Id: If65ff532621f53f9ccf554121d702c3c41da5a96

3 years agoMerge "DO NOT MERGE - Merge RP1A.201005.006"
Xin Li [Tue, 6 Oct 2020 20:17:27 +0000 (20:17 +0000)]
Merge "DO NOT MERGE - Merge RP1A.201005.006"

3 years agoGD-Logging: Add INIT flags to configure debug logging
Jack He [Mon, 5 Oct 2020 23:38:37 +0000 (16:38 -0700)]
GD-Logging: Add INIT flags to configure debug logging

* Three flags:
 - INIT_logging_debug_enabled_for_all
 - INIT_logging_debug_enabled_for_tags
 - INIT_logging_debug_disabled_for_tags
* If a tag is explicitly disabled or enabled, we will follow that
  setting. Otherwise, we check the global enable flag
* This setup allows us to enable/disable individual tags as well as
  enable or disable debug logging for all tags
* This affects only DEBUG and VERBOSE level logs

Bug: 170163727
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Idb99ef1ca0a2d14c73069fcba396ac76a61ee39d

3 years agoGD-Logging: Change LOG_DEBUG to LOG_INFO
Jack He [Tue, 6 Oct 2020 05:50:55 +0000 (22:50 -0700)]
GD-Logging: Change LOG_DEBUG to LOG_INFO

* Given that LOG_DEBUG will be disabled by default,
  changing existing LOG_DEBUG to LOG_INFO so that
  we don't lose these logs

Bug: 170163727
Test: atest bluetooth_test_gd, manual device test
Tag: #gd-refactor
Change-Id: I84db7751d4bbe6d3ea88122b8cdf72bc150fbe7a

3 years agoMerge "bthal: Do not allow to initialize more than once"
Treehugger Robot [Tue, 6 Oct 2020 18:27:28 +0000 (18:27 +0000)]
Merge "bthal: Do not allow to initialize more than once"

3 years agoDO NOT MERGE - Merge RP1A.201005.006
The Android Open Source Project [Tue, 6 Oct 2020 04:00:27 +0000 (21:00 -0700)]
DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Merged-In: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Change-Id: I1be981905f9b5c60b9fc0071200116a368996e00

3 years agoProperly shim controller flags
Chris Manton [Tue, 6 Oct 2020 00:32:51 +0000 (17:32 -0700)]
Properly shim controller flags

Bug: 166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I7d311bda8d86ca87032d8a45d35ab4d00a5d4038

3 years agoRe-log stack/l2cap/l2c_ble::l2cble_conn_comp
Chris Manton [Mon, 21 Sep 2020 20:57:11 +0000 (13:57 -0700)]
Re-log stack/l2cap/l2c_ble::l2cble_conn_comp

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6dfd621e83868b36fdb1ac16825db8176600adb9

3 years agoLegacy ACL shim interface
Chris Manton [Mon, 5 Oct 2020 17:07:15 +0000 (10:07 -0700)]
Legacy ACL shim interface

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I2aaa3459e9537a896b374aa2a3eac85aaf1ea30c

3 years agoRemove unused #defs stack/include/hcidefs
Chris Manton [Mon, 21 Sep 2020 15:20:28 +0000 (08:20 -0700)]
Remove unused #defs stack/include/hcidefs

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6b657cf604fac0e3fdb4e51b071c02b451f6e95c

3 years agoRemove unused #defs stack/include/bt_types
Chris Manton [Mon, 21 Sep 2020 00:41:54 +0000 (17:41 -0700)]
Remove unused #defs stack/include/bt_types

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Iff89e74e95d78fe5cf053ca20fead3076fd18cdf

3 years agoRemove unused var tBTM_SEC_DEV_REC::link_key_changed
Chris Manton [Sun, 20 Sep 2020 23:30:42 +0000 (16:30 -0700)]
Remove unused var tBTM_SEC_DEV_REC::link_key_changed

set-once-to-default-read-never

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ife93f8028096744171ae79f2d8608c87e352eff0

3 years agoStreamline stack/l2cap/l2c_ble::l2cble_notify_le_connection
Chris Manton [Sat, 3 Oct 2020 16:22:57 +0000 (09:22 -0700)]
Streamline stack/l2cap/l2c_ble::l2cble_notify_le_connection

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I1ffb5df7acd8f616822ec3eeacef7d88d6dbc249

3 years agoAdd stack/include/bt_types::AddressTypeText
Chris Manton [Mon, 21 Sep 2020 21:00:48 +0000 (14:00 -0700)]
Add stack/include/bt_types::AddressTypeText

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I43b7c46837435ea544eb2e8c90ef981a3bdf3e2f

3 years agoRe-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr
Chris Manton [Sun, 4 Oct 2020 22:03:38 +0000 (15:03 -0700)]
Re-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1ba3ec9198e9832e323da0e8b6e604eb8c8c1c81

3 years agoRe-log stack/acl/btm_acl
Chris Manton [Sun, 4 Oct 2020 01:13:17 +0000 (18:13 -0700)]
Re-log stack/acl/btm_acl

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: Iaf187f592f23992451a741e48d6a9f3730de3f56

3 years agoReplace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE
Chris Manton [Thu, 10 Sep 2020 03:32:52 +0000 (20:32 -0700)]
Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE

Towards the shortest path

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I9475559159475f9f9d81a921cf14c2db62be3839

3 years agoSimplify StackAclBtmAcl::btm_bda_to_acl
Chris Manton [Sun, 16 Aug 2020 22:03:26 +0000 (15:03 -0700)]
Simplify StackAclBtmAcl::btm_bda_to_acl

Towards proper interfaces

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I6573f60cbf5e469fe780c6d5a4506c0dcd39f590

3 years agoInternally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr
Chris Manton [Mon, 17 Aug 2020 04:55:20 +0000 (21:55 -0700)]
Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: Id440b966613aaeb4b39ece7d4517a5158e823456

3 years agoMerge "Remove init flags log message, you can check the dumpsys now"
Treehugger Robot [Tue, 6 Oct 2020 02:31:40 +0000 (02:31 +0000)]
Merge "Remove init flags log message, you can check the dumpsys now"

3 years agoMerge "Add A2DP/SDP fuzzers for bt-stack"
Treehugger Robot [Tue, 6 Oct 2020 00:58:46 +0000 (00:58 +0000)]
Merge "Add A2DP/SDP fuzzers for bt-stack"

3 years agoenum-ify tgatt_status
Chris Manton [Sun, 4 Oct 2020 17:09:34 +0000 (10:09 -0700)]
enum-ify tgatt_status

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I44a41dfbf11c1bbca77c8f568ed1ada236476d6f

3 years agoInclude security_device_record stack/acl/btm_acl
Chris Manton [Mon, 17 Aug 2020 15:01:56 +0000 (08:01 -0700)]
Include security_device_record stack/acl/btm_acl

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I3b2ed7bd82dff9b504223aa9ea93a72a1c0575b7

3 years agoRemove unused defs BTM_ACL_PKT_TYPES_MASK_
Chris Manton [Sun, 16 Aug 2020 18:21:05 +0000 (11:21 -0700)]
Remove unused defs BTM_ACL_PKT_TYPES_MASK_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I59f2004e5450834dcdc725f52942923aa5294fe4

3 years agolog tgatt status properly
Chris Manton [Sun, 4 Oct 2020 06:47:35 +0000 (23:47 -0700)]
log tgatt status properly

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I5e4c526baca73a3c4e5e64a4b4bea4daab31116a

3 years agoencapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC
Chris Manton [Mon, 7 Sep 2020 19:51:18 +0000 (12:51 -0700)]
encapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ia5e04ba5c05783ee6b7458989f1898c50db80584

3 years agoProperly add typedef for gatt status
Chris Manton [Sun, 4 Oct 2020 06:46:48 +0000 (23:46 -0700)]
Properly add typedef for gatt status

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I058946087572442b26a42e36076db273076c7518

3 years agoMerge "GD Security: Fix bad conditional"
Treehugger Robot [Sat, 3 Oct 2020 23:57:33 +0000 (23:57 +0000)]
Merge "GD Security: Fix bad conditional"

3 years agoGD Security: Fix bad conditional
Martin Brabham [Fri, 2 Oct 2020 19:03:34 +0000 (12:03 -0700)]
GD Security: Fix bad conditional

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I87bb3ac3ae7ccfc8164cf8565eb1e88f2f44e2d6

3 years agoAdd include stack/smp/smp_act::smp_api_types.h
Chris Manton [Sun, 13 Sep 2020 22:39:15 +0000 (15:39 -0700)]
Add include stack/smp/smp_act::smp_api_types.h

Include what you use

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1de6caf318d75776ac2dbc5456ea32e287622d39

3 years agoEncapulate tBTM_SEC_DEV_REC::pin_code_length
Chris Manton [Sun, 20 Sep 2020 23:25:17 +0000 (16:25 -0700)]
Encapulate tBTM_SEC_DEV_REC::pin_code_length

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ic48c5e60495b4308bf6c7b26e9de18745453bed8

3 years agoWrap API around tBTM_SEC_DEV_REC::BTM_SEC_
Chris Manton [Sun, 20 Sep 2020 20:45:43 +0000 (13:45 -0700)]
Wrap API around tBTM_SEC_DEV_REC::BTM_SEC_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I3e337b78e2ba7ed2eb2cf328d6b03c43a998fef4

3 years agoRe-log btif/src/btif_sdp_server::
Chris Manton [Thu, 24 Sep 2020 18:15:58 +0000 (11:15 -0700)]
Re-log btif/src/btif_sdp_server::

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ia57c281cc844a4c254c53324a4c4bd1eaf7af1c3

3 years agoRemove unused decls stack/btm/btm_int
Chris Manton [Sun, 20 Sep 2020 22:20:48 +0000 (15:20 -0700)]
Remove unused decls stack/btm/btm_int

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: If3c47ffa09fa458a381a381cddc6f37a9835f7a4

3 years agoenum-ify BTM_SEC_ and BTM_SEC_LE
Chris Manton [Sun, 20 Sep 2020 20:10:11 +0000 (13:10 -0700)]
enum-ify BTM_SEC_ and BTM_SEC_LE

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ifde2b62d2e368188d3454236b616adc2ca9dfcce

3 years agoRemove unused var tBTM_CB::state_temp_buffer
Chris Manton [Sun, 20 Sep 2020 20:14:00 +0000 (13:14 -0700)]
Remove unused var tBTM_CB::state_temp_buffer

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I2b6ffcae31b3b6fea84e59fac01962609557217b

3 years agoEncapsulate tBTM_CB::btm_scn
Chris Manton [Sun, 20 Sep 2020 19:46:31 +0000 (12:46 -0700)]
Encapsulate tBTM_CB::btm_scn

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ic947434651ba3312342507ac1ff4da92e176b0bb

3 years agoEncapsulate tBTM_CB::enc_rand, ediv, key_size
Chris Manton [Sun, 20 Sep 2020 16:13:26 +0000 (09:13 -0700)]
Encapsulate tBTM_CB::enc_rand, ediv, key_size

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I7e5962356b64b52011e370deb03b53a2ca4b42ad

3 years agoEncapsulate tBTM_CB::enc_handle
Chris Manton [Sun, 20 Sep 2020 16:01:13 +0000 (09:01 -0700)]
Encapsulate tBTM_CB::enc_handle

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I735a002c545f62ae75676e72d068a2f3d097eda9

3 years agoL2CA_SetFlushTimeout does nothing.
Chris Manton [Sat, 3 Oct 2020 20:19:51 +0000 (13:19 -0700)]
L2CA_SetFlushTimeout does nothing.

aosp/1443546

Bug: 159815595
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ib18923477830f5f5bf2c8748da5a817a9871ec1e

3 years agoRe-align read remote version information on legacy
Chris Manton [Sat, 3 Oct 2020 17:01:53 +0000 (10:01 -0700)]
Re-align read remote version information on legacy

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I7be1ecba73234431194ad9702ec3ea06b09c60bc

3 years agoMerge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092
Treehugger Robot [Sat, 3 Oct 2020 00:46:19 +0000 (00:46 +0000)]
Merge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092

* changes:
  Precise naming match => is_in_security_db
  enum-ify _SCAN both classic and ble
  enum-ify _INQUIRY both classic and ble
  enum-ify _CONNECTABLE both classic and ble
  enum-ify _DISCOVERABLE both classic and ble

3 years agoMerge "Convert mask types from uint32_t to enum type"
Treehugger Robot [Fri, 2 Oct 2020 23:30:05 +0000 (23:30 +0000)]
Merge "Convert mask types from uint32_t to enum type"

3 years agoSMP: Assume L2cap tx completes immediately
Hansong Zhang [Fri, 2 Oct 2020 00:47:03 +0000 (17:47 -0700)]
SMP: Assume L2cap tx completes immediately

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5bf5c5067f3ad3d48716fdc65f73920107d034cf

3 years agoL2cap: LE address type is not used
Hansong Zhang [Thu, 1 Oct 2020 07:03:59 +0000 (00:03 -0700)]
L2cap: LE address type is not used

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie13f6e7cda6feb23d25ae661abeb7221757e9da7

3 years agoLink flush timeout is unused
Hansong Zhang [Thu, 1 Oct 2020 06:53:46 +0000 (23:53 -0700)]
Link flush timeout is unused

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Icf6fec9bd038210a31eb8ab38a96f44d3ce2ffd2

3 years agoConvert mask types from uint32_t to enum type
Mikhail Naganov [Fri, 2 Oct 2020 01:08:16 +0000 (18:08 -0700)]
Convert mask types from uint32_t to enum type

This applies to the following types:

- audio_gain_mode_t;
- audio_flags_mask_t;
- audio_channel_representation_t;
- audio_channel_mask_t;
- audio_devices_t.

Enum types are distinct thus proper overloading on the type
is possible in C++. Also, assignments to enum types are
less prone to errors.

Bug: 169889714
Test: basic audio functionality
Tag: #refactor
Change-Id: I7b064b282ce9f533f91ef13a4852b3e9f308f6c0

3 years agoPrecise naming match => is_in_security_db
Chris Manton [Sun, 20 Sep 2020 15:43:57 +0000 (08:43 -0700)]
Precise naming match => is_in_security_db

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ib1f71d7e94ab471a04c25b74cfb8cda5fab3cef5

3 years agoenum-ify _SCAN both classic and ble
Chris Manton [Sun, 20 Sep 2020 06:29:24 +0000 (23:29 -0700)]
enum-ify _SCAN both classic and ble

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I917ba2204a79af800afefe1b7e046a9510316030