OSDN Git Service

android-x86/system-bt.git
3 years agoSDP: We always use basic mode
Hansong Zhang [Wed, 23 Sep 2020 22:12:42 +0000 (15:12 -0700)]
SDP: We always use basic mode

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

3 years agoRFCOMM code minor clean up
Hansong Zhang [Wed, 23 Sep 2020 22:12:06 +0000 (15:12 -0700)]
RFCOMM code minor clean up

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

3 years agoMerge "RootCanal: Set event masks"
Treehugger Robot [Thu, 24 Sep 2020 00:43:51 +0000 (00:43 +0000)]
Merge "RootCanal: Set event masks"

3 years agoMerge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ...
Treehugger Robot [Wed, 23 Sep 2020 23:48:50 +0000 (23:48 +0000)]
Merge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ...

* changes:
  Re-log bta/gatt::bta_gattc_conn_cback
  Re-include btif/src/btif_sock_l2cap
  Eliminate socket verbosity print_events()
  Re-log stack/acl::BTM_SwitchRole
  Reduce identical APIs
  Remove #def code conditional BTM_MAX_SCO_LINKS
  Remove unused #defs stack/btm/btm_ble_int_types::
  Internally link stack/btm/btm_ble_gap::btm_send_hci_scan_enable
  Use new APIS stack/acl/btm_acl
  Streamline stack/acl/btm_acl::btm_acl_created
  Add new APIS stack/acl/btm_acl

3 years agoRootCanal: Set event masks
Myles Watson [Wed, 23 Sep 2020 13:24:55 +0000 (06:24 -0700)]
RootCanal: Set event masks

Test: cert/run --host
Bug: 145832107
Tag: #gd-refactor
Change-Id: Ie8b63828c2d774852682c0ff6888150d9ee524fc

3 years agoSDP code clean up
Hansong Zhang [Wed, 23 Sep 2020 05:59:42 +0000 (22:59 -0700)]
SDP code clean up

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

3 years agopL2CA_DisconnectCfm_Cb is unused
Hansong Zhang [Wed, 23 Sep 2020 05:54:01 +0000 (22:54 -0700)]
pL2CA_DisconnectCfm_Cb is unused

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

3 years agoHIDH: Move L2cap disconnect logic together
Hansong Zhang [Wed, 23 Sep 2020 05:47:15 +0000 (22:47 -0700)]
HIDH: Move L2cap disconnect logic together

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

3 years agoHIDD: Move L2cap disconnect logic together
Hansong Zhang [Wed, 23 Sep 2020 05:45:27 +0000 (22:45 -0700)]
HIDD: Move L2cap disconnect logic together

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

3 years agoAVCT: Move L2cap disconnect logic together
Hansong Zhang [Wed, 23 Sep 2020 05:32:27 +0000 (22:32 -0700)]
AVCT: Move L2cap disconnect logic together

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

3 years agoAVCT_BR: Move L2cap disconnect logic together
Hansong Zhang [Wed, 23 Sep 2020 05:29:06 +0000 (22:29 -0700)]
AVCT_BR: Move L2cap disconnect logic together

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

3 years agoAVDT: Move L2cap disconnect logic together
Hansong Zhang [Wed, 23 Sep 2020 05:07:03 +0000 (22:07 -0700)]
AVDT: Move L2cap disconnect logic together

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

3 years agoRemove unused parameter in avdt_ad_tc_close_ind
Hansong Zhang [Wed, 23 Sep 2020 04:58:21 +0000 (21:58 -0700)]
Remove unused parameter in avdt_ad_tc_close_ind

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

3 years agoRe-log bta/gatt::bta_gattc_conn_cback
Chris Manton [Sat, 19 Sep 2020 01:15:36 +0000 (18:15 -0700)]
Re-log bta/gatt::bta_gattc_conn_cback

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I5fad51611fb62c197f2860c98470cf32e7afab8d

3 years agoRe-include btif/src/btif_sock_l2cap
Chris Manton [Sat, 19 Sep 2020 16:00:37 +0000 (09:00 -0700)]
Re-include btif/src/btif_sock_l2cap

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I7ce390ca7539b8510ad1e42a170fd69b0ab7b9b9

3 years agoEliminate socket verbosity print_events()
Chris Manton [Sat, 19 Sep 2020 00:52:55 +0000 (17:52 -0700)]
Eliminate socket verbosity print_events()

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ib0b4ea11c811ab409bbef01b6a432bc0db64a62c

3 years agoRe-log stack/acl::BTM_SwitchRole
Chris Manton [Sat, 19 Sep 2020 00:25:46 +0000 (17:25 -0700)]
Re-log stack/acl::BTM_SwitchRole

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I6cc72e13dc3aac0543d4d3dc7b16113f974be99d

3 years agoReduce identical APIs
Chris Manton [Fri, 18 Sep 2020 23:54:55 +0000 (16:54 -0700)]
Reduce identical APIs

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ic4a66b2cb8752064bb2bcaf43c6dee20002117f3

3 years agoRemove #def code conditional BTM_MAX_SCO_LINKS
Chris Manton [Fri, 18 Sep 2020 23:59:05 +0000 (16:59 -0700)]
Remove #def code conditional BTM_MAX_SCO_LINKS

Ok for constants, poor for code conditionals

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Iae348262a3dc8449efaa7caaf45560918aaff8b7

3 years agoRemove unused #defs stack/btm/btm_ble_int_types::
Chris Manton [Fri, 18 Sep 2020 16:12:31 +0000 (09:12 -0700)]
Remove unused #defs stack/btm/btm_ble_int_types::

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I95c3ddce09f0492e1d6026ecba18ee8f44838261

3 years agoInternally link stack/btm/btm_ble_gap::btm_send_hci_scan_enable
Chris Manton [Fri, 18 Sep 2020 15:59:31 +0000 (08:59 -0700)]
Internally link stack/btm/btm_ble_gap::btm_send_hci_scan_enable

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I40fd942c5ff05acf4242f2a8e68de35308c1ddb8

3 years agoUse new APIS stack/acl/btm_acl
Chris Manton [Tue, 22 Sep 2020 23:01:31 +0000 (16:01 -0700)]
Use new APIS stack/acl/btm_acl

internal_.acl_allocate_connection
acl_initialize_power_mode

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Icffd9db5591a746f6c2ebb95abb8461c35dd9f60

3 years agoStreamline stack/acl/btm_acl::btm_acl_created
Chris Manton [Tue, 22 Sep 2020 21:22:30 +0000 (14:22 -0700)]
Streamline stack/acl/btm_acl::btm_acl_created

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I0b3f15344dc9b7b19f810a39a98e0dc6d46d520b

3 years agoAdd new APIS stack/acl/btm_acl
Chris Manton [Tue, 22 Sep 2020 23:01:31 +0000 (16:01 -0700)]
Add new APIS stack/acl/btm_acl

Towards readable code

internal_.acl_allocate_connection
acl_initialize_power_mode

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ib76feefe0e95557b324dd837c294050da73c8106

3 years agoMerge "NameDB: Actually remove the address from requested addresses"
Treehugger Robot [Wed, 23 Sep 2020 20:31:05 +0000 (20:31 +0000)]
Merge "NameDB: Actually remove the address from requested addresses"

3 years agoGATT: Put L2cap disconnect logic together
Hansong Zhang [Wed, 23 Sep 2020 04:54:33 +0000 (21:54 -0700)]
GATT: Put L2cap disconnect logic together

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

3 years agoSDP: Remove sdp_disconnect_cfm
Hansong Zhang [Wed, 23 Sep 2020 04:37:08 +0000 (21:37 -0700)]
SDP: Remove sdp_disconnect_cfm

Just invoke the callbacks when we send disconnect request.

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

3 years agoL2c_int: Remove unused function
Hansong Zhang [Wed, 23 Sep 2020 03:49:17 +0000 (20:49 -0700)]
L2c_int: Remove unused function

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

3 years agoSend L2CA_DisconnectRsp from L2cap state machine
Hansong Zhang [Tue, 22 Sep 2020 23:46:48 +0000 (16:46 -0700)]
Send L2CA_DisconnectRsp from L2cap state machine

Instead of having client send it.

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

3 years agoSDP_BROWSE_PLUS is never true
Hansong Zhang [Tue, 22 Sep 2020 22:56:54 +0000 (15:56 -0700)]
SDP_BROWSE_PLUS is never true

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

3 years agoRe-log stack/acl/btm_acl::btm_acl_created
Chris Manton [Tue, 22 Sep 2020 20:53:47 +0000 (13:53 -0700)]
Re-log stack/acl/btm_acl::btm_acl_created

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I43713ef1a4eb7dd4ad62865056e8f05c2455277d

3 years agoAdd types::BtTransportText
Chris Manton [Sat, 19 Sep 2020 01:11:17 +0000 (18:11 -0700)]
Add types::BtTransportText

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I6fc84ef84a169f2a04b9aa7726206c58d8848021

3 years agoAdd hci role text
Chris Manton [Mon, 21 Sep 2020 20:55:50 +0000 (13:55 -0700)]
Add hci role text

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I713403023a53905821e39ad9a8251bab9a8779ca

3 years agoenum-ify stack/include/hcidefs::HCI_ROLE_
Chris Manton [Sat, 19 Sep 2020 20:47:45 +0000 (13:47 -0700)]
enum-ify stack/include/hcidefs::HCI_ROLE_

Also add typed storage

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I7d7097e8ba92bd6035ba027df93a905274eaec27

3 years agoRe-Var stack/acl/btm_acl::btm_acl_created
Chris Manton [Tue, 22 Sep 2020 20:21:58 +0000 (13:21 -0700)]
Re-Var stack/acl/btm_acl::btm_acl_created

Because 'p' is a terrible variable name

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I78ef2c1051ba151dbe605114aa5c45097f29bcde

3 years agoMerge "SDP: We always use basic mode"
Treehugger Robot [Wed, 23 Sep 2020 03:47:51 +0000 (03:47 +0000)]
Merge "SDP: We always use basic mode"

3 years agoMerge "[fuzzing] Add liblog dependency."
Treehugger Robot [Wed, 23 Sep 2020 03:03:01 +0000 (03:03 +0000)]
Merge "[fuzzing] Add liblog dependency."

3 years ago[fuzzing] Add liblog dependency.
Mitch Phillips [Tue, 22 Sep 2020 20:44:23 +0000 (13:44 -0700)]
[fuzzing] Add liblog dependency.

Static dependencies don't carry transient dynamic dependencies to the
link line. We need to link liblog as it's a necessary dependency, and
this is revealed with a new toolchain update. For more info, see the
bug.

Tag: #refactor
Bug: 131771163
Test: gd/fuzz/run libosi_fuzz_list
Change-Id: I9404ef275cf1814ac4803d8478af46cd949cd8e7

3 years agoNameDB: Actually remove the address from requested addresses
Martin Brabham [Tue, 22 Sep 2020 00:17:25 +0000 (17:17 -0700)]
NameDB: Actually remove the address from requested addresses

When a ReadRemoteName is called, there is a single PendingRemoteNameRead
struct that is set.  This contains the callback and handler.  Once this
is set, you cannot set another.  The initial problem is that in the
OnRemoteReadResponse we never remove it from an internal tracking map.
This map prevents us from making duplicate requests which is good, but
since it's never removed, we can only request one time.

This CL fixes that by removing it in the OnRemoteReadResponse.

Additionally, from an API standpoint we want to provide a functioning
API.  If a caller requests a name read and provides a callback, then why
not just call their callback when we get the data instead of telling
them we can't meet their needs (which is untrue).

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

3 years agoSDP: We always use basic mode
Hansong Zhang [Tue, 22 Sep 2020 22:30:06 +0000 (15:30 -0700)]
SDP: We always use basic mode

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

3 years agoMerge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ...
Treehugger Robot [Tue, 22 Sep 2020 22:27:50 +0000 (22:27 +0000)]
Merge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ...

* changes:
  enum-ify stack/btm/btm_ble_int_types::tBTM_BLE_SEC_REQ_ACT
  enumify tL2C_CB::tL2C_LCB::conn_update_mask
  Remove unnecesary warning on expected parsing failure
  Only read power mode on non-le links
  Add helpers tL2C_CB::tL2C_LCB::tBT_TRANSPORT
  Streamline stack/l2cap/l2c_link::l2c_link_check_power_mode
  Internally link stack/l2cap/l2c_link::l2c_link_check_power_mode
  Remove def stack/l2cap/l2c_link::L2C_LINK_CHECK_POWER_MODE
  Slight cleanup stack/acl/btm_pm::BTM_SetSsrParams
  Specialize data structures tBTM_PM_STATUS tBTM_PM_MODE

3 years agoMerge "stack: Periodic advertising scanner implementation"
Jakub Pawlowski [Tue, 22 Sep 2020 21:08:44 +0000 (21:08 +0000)]
Merge "stack: Periodic advertising scanner implementation"

3 years agoenum-ify stack/btm/btm_ble_int_types::tBTM_BLE_SEC_REQ_ACT
Chris Manton [Fri, 18 Sep 2020 15:54:40 +0000 (08:54 -0700)]
enum-ify stack/btm/btm_ble_int_types::tBTM_BLE_SEC_REQ_ACT

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I05ccdb3e4b1b42810f77a4d6322606434a4b58c7

3 years agoenumify tL2C_CB::tL2C_LCB::conn_update_mask
Chris Manton [Fri, 4 Sep 2020 01:42:14 +0000 (18:42 -0700)]
enumify tL2C_CB::tL2C_LCB::conn_update_mask

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I00065f6573074738be0860365038a73f8b587e2e

3 years agoRemove unnecesary warning on expected parsing failure
Chris Manton [Thu, 3 Sep 2020 21:08:58 +0000 (14:08 -0700)]
Remove unnecesary warning on expected parsing failure

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I2310c69cf6b40e494d9aa191da590a8ea89c7e16

3 years agoOnly read power mode on non-le links
Chris Manton [Thu, 3 Sep 2020 17:28:24 +0000 (10:28 -0700)]
Only read power mode on non-le links

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I8832601ee35a0054085917cf92c6f51ca7f5aa4c

3 years agoAdd helpers tL2C_CB::tL2C_LCB::tBT_TRANSPORT
Chris Manton [Thu, 3 Sep 2020 17:24:13 +0000 (10:24 -0700)]
Add helpers tL2C_CB::tL2C_LCB::tBT_TRANSPORT

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I55ec884b8fbff02337b02616ba56566c908aebf4

3 years agoStreamline stack/l2cap/l2c_link::l2c_link_check_power_mode
Chris Manton [Thu, 3 Sep 2020 17:20:16 +0000 (10:20 -0700)]
Streamline stack/l2cap/l2c_link::l2c_link_check_power_mode

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ie696eafbc080777850b71ac5fad846ffcfc2ec8c

3 years agoInternally link stack/l2cap/l2c_link::l2c_link_check_power_mode
Chris Manton [Thu, 3 Sep 2020 17:16:41 +0000 (10:16 -0700)]
Internally link stack/l2cap/l2c_link::l2c_link_check_power_mode

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: If653303d78db7ed0dea16ef6dfff1de7c2766d74

3 years agoRemove def stack/l2cap/l2c_link::L2C_LINK_CHECK_POWER_MODE
Chris Manton [Thu, 3 Sep 2020 17:14:30 +0000 (10:14 -0700)]
Remove def stack/l2cap/l2c_link::L2C_LINK_CHECK_POWER_MODE

Unnecessary layer of indirection

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I0e99b5df8fb0f2f678ae94320b1daaac78d606dd

3 years agoSlight cleanup stack/acl/btm_pm::BTM_SetSsrParams
Chris Manton [Thu, 3 Sep 2020 16:59:12 +0000 (09:59 -0700)]
Slight cleanup stack/acl/btm_pm::BTM_SetSsrParams

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I66a26522b52ffb15bbf38424ee0f06ab2daa1ef5

3 years agoSpecialize data structures tBTM_PM_STATUS tBTM_PM_MODE
Chris Manton [Thu, 3 Sep 2020 16:04:58 +0000 (09:04 -0700)]
Specialize data structures tBTM_PM_STATUS tBTM_PM_MODE

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I4868fd81c0a5c6c788382f0c81a4d908685642e6

3 years agoMerge "Revert "HciHalTest: Handle EINTR when reading""
Treehugger Robot [Tue, 22 Sep 2020 19:01:47 +0000 (19:01 +0000)]
Merge "Revert "HciHalTest: Handle EINTR when reading""

3 years agoMerge "GD-HCI: Add verbose logging for Tx and Rx packets"
Treehugger Robot [Tue, 22 Sep 2020 18:51:25 +0000 (18:51 +0000)]
Merge "GD-HCI: Add verbose logging for Tx and Rx packets"

3 years agoRevert "HciHalTest: Handle EINTR when reading"
Myles Watson [Tue, 22 Sep 2020 16:03:04 +0000 (16:03 +0000)]
Revert "HciHalTest: Handle EINTR when reading"

This reverts commit 46808b2623f5ea68899a26bf3fa9782c6425cb69.

Reason for revert: EINTR shouldn't happen with a local socket.  This is overkill.

Bug: 168760472
Change-Id: I5dc8e6eb9ee7c360e802452a1ffe804d65f20561
Tag: #gd-refactor
Test: atest bluetooth_test_gd

3 years agostack: Periodic advertising scanner implementation
Jakub Tyszkowski [Thu, 30 Apr 2020 10:42:01 +0000 (12:42 +0200)]
stack: Periodic advertising scanner implementation

This adds the ble_scanner_hci_interface for periodic advertising scan
and all the low level HCI commands and event handlers.

Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: compilation
Change-Id: I20e7057a8806c5ca8ef9e7261e1c2b446135cbed

3 years agoGD-HCI: Add verbose logging for Tx and Rx packets
Jack He [Tue, 22 Sep 2020 03:40:15 +0000 (20:40 -0700)]
GD-HCI: Add verbose logging for Tx and Rx packets

* Add StringFormat method
* Add verbose logging in GD Android HIDL client for every outgoing
  HCI transmission and incoming HCI transmission

Bug: 164973960
Test: make, atest bluetooth_test_gd, listen to music
Tag: #gd-refactor
Change-Id: I1b12c0180b835d9a0f3f641d80b62131e5b72fd4

3 years agoUse acl ble stack/acl/::acl_ble_connection_
Chris Manton [Mon, 21 Sep 2020 17:32:35 +0000 (10:32 -0700)]
Use acl ble stack/acl/::acl_ble_connection_

Also restore propogation of properly resolved ble address

acl_ble_connection_complete
acl_ble_enhanced_connection_complete
acl_ble_connection_fail

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: Ibf8c6355697ef82c97d1b55332792908c494b743

3 years agoMerge changes I9c6cce21,I808a6fd2,I263e4cfd,I522fcfa3,I6abb2319, ...
Treehugger Robot [Mon, 21 Sep 2020 22:02:27 +0000 (22:02 +0000)]
Merge changes I9c6cce21,I808a6fd2,I263e4cfd,I522fcfa3,I6abb2319, ...

* changes:
  Remove unused stack/btm/btm_ble_int_types::tINQ_LE_BDADDR
  Remove constant var tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::scan_duplicate_filter
  Remove never-set vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::
  Add Api tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_mode
  Remove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB
  Expand clever stack/btm/btm_ble_gap::btm_set_conn_mode_adv_init_addr
  Remove tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::tx_power
  Remove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB
  Remove never-set var tBTM_CB::tBTM_BLE_CB::mixed_mode
  Const-ify size tBTM_CB::tBTM_BLE_CB::link_count[]
  Remove unused var tBTM_CB::tBTM_BLE_CB::enabled
  Add Api around tBTM_CB::paging
  Remove tBTM_CB::discing can never be true

3 years agoMerge "Remove unneeded cflags and ldflags"
Treehugger Robot [Mon, 21 Sep 2020 21:19:40 +0000 (21:19 +0000)]
Merge "Remove unneeded cflags and ldflags"

3 years agoRemove unused stack/btm/btm_ble_int_types::tINQ_LE_BDADDR
Chris Manton [Fri, 18 Sep 2020 15:44:52 +0000 (08:44 -0700)]
Remove unused stack/btm/btm_ble_int_types::tINQ_LE_BDADDR

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I9c6cce2135abd683ed383e600d9034c5ed52131b

3 years agoRemove constant var tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::scan_duplicate_filter
Chris Manton [Fri, 18 Sep 2020 15:30:17 +0000 (08:30 -0700)]
Remove constant var tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::scan_duplicate_filter

Always set to same value

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I808a6fd2466d7f72f0ab41d2862e3bf64910f718

3 years agoRemove never-set vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::
Chris Manton [Fri, 18 Sep 2020 15:16:40 +0000 (08:16 -0700)]
Remove never-set vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::

tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_interval_min
tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_interval_max

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I263e4cfd19a17affd9838cbaad52abb3fbe4185b

3 years agoAdd Api tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_mode
Chris Manton [Fri, 18 Sep 2020 03:21:42 +0000 (20:21 -0700)]
Add Api tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_mode

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I522fcfa31f36d487777d6b228cbdacd8b3ef9884

3 years agoRemove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB
Chris Manton [Fri, 18 Sep 2020 03:06:35 +0000 (20:06 -0700)]
Remove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB

tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::num_bd_entries
tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::max_bd_entries

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I6abb23191fb4cdfe7a175862e01643b497297afb

3 years agoExpand clever stack/btm/btm_ble_gap::btm_set_conn_mode_adv_init_addr
Chris Manton [Fri, 18 Sep 2020 02:55:21 +0000 (19:55 -0700)]
Expand clever stack/btm/btm_ble_gap::btm_set_conn_mode_adv_init_addr

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: Ibf79e13860f728277f6377db91a4865881b3a048

3 years agoRemove tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::tx_power
Chris Manton [Fri, 18 Sep 2020 02:46:03 +0000 (19:46 -0700)]
Remove tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::tx_power

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I5ba9d8908c249e53976567af258deb0ce8e218d5

3 years agoRemove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB
Chris Manton [Fri, 18 Sep 2020 02:20:54 +0000 (19:20 -0700)]
Remove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB

tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB::p
tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB::p_generate_cback
tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB::random_bda

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I8752296aef2348778fca7d9d1fa3dce67017cee2

3 years agoRemove never-set var tBTM_CB::tBTM_BLE_CB::mixed_mode
Chris Manton [Fri, 18 Sep 2020 01:40:06 +0000 (18:40 -0700)]
Remove never-set var tBTM_CB::tBTM_BLE_CB::mixed_mode

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I5cd5b8b10a8480ee8ea8a81de0c75d0f57f6fa53

3 years agoConst-ify size tBTM_CB::tBTM_BLE_CB::link_count[]
Chris Manton [Fri, 18 Sep 2020 01:35:15 +0000 (18:35 -0700)]
Const-ify size tBTM_CB::tBTM_BLE_CB::link_count[]

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I7d4e5e40600fc264fc30f51bb5a7fd1ebca7636d

3 years agoRemove unused var tBTM_CB::tBTM_BLE_CB::enabled
Chris Manton [Fri, 18 Sep 2020 01:25:31 +0000 (18:25 -0700)]
Remove unused var tBTM_CB::tBTM_BLE_CB::enabled

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I135ae450329b381147917d0fe6f6e477dd9582c9

3 years agoAdd Api around tBTM_CB::paging
Chris Manton [Fri, 18 Sep 2020 01:15:13 +0000 (18:15 -0700)]
Add Api around tBTM_CB::paging

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I4428c989124c8b4735162f9e798e96eaee87ce85

3 years agoRemove tBTM_CB::discing can never be true
Chris Manton [Fri, 18 Sep 2020 01:08:20 +0000 (18:08 -0700)]
Remove tBTM_CB::discing can never be true

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I9ab220375763f1bf8959ace85ef1fc02eca81bd5

3 years agoMerge "HciHalTest: Handle EINTR when reading"
Myles Watson [Mon, 21 Sep 2020 19:50:04 +0000 (19:50 +0000)]
Merge "HciHalTest: Handle EINTR when reading"

3 years agoHciHalTest: Handle EINTR when reading
Myles Watson [Mon, 21 Sep 2020 17:44:32 +0000 (10:44 -0700)]
HciHalTest: Handle EINTR when reading

Bug: 168760472
Tag: #stability
Test: atest bluetooth_test_gd
Change-Id: I3b2cb84a5a4674ed6018124c3a9c0e90d8cafc7b

3 years agoRemove unneeded cflags and ldflags
Yi Kong [Mon, 21 Sep 2020 17:05:18 +0000 (01:05 +0800)]
Remove unneeded cflags and ldflags

These flags were converted from old build rules. The build succeeds
without these flags.

Test: m checkbuild
Bug: 169004486
Tag: #refactor
Change-Id: I38fb41c4f23d5681b9574bb479cdb0f999dbb6a4

3 years agoRevert "Remove unused #def and #ifdef stack/include/btm_ble_api_types"
Robin Lee [Mon, 21 Sep 2020 10:16:55 +0000 (10:16 +0000)]
Revert "Remove unused #def and #ifdef stack/include/btm_ble_api_types"

This reverts commit bb15392871b9c72699cfe0becfe061e250ebd837.

Bug: 169035455
Bug: 163134718
Tag: #refactor
Test: atest BluetoothInstrumentationTests
Reason for revert: Breaks devices overriding these fields

Change-Id: Idc73154004bddc0a905911b29c7ddfb868bc7533

3 years agoMerge "Add ext prop value into hash calculation"
Treehugger Robot [Mon, 21 Sep 2020 05:21:48 +0000 (05:21 +0000)]
Merge "Add ext prop value into hash calculation"

3 years agoRestore select #ifdefs stack/include/btm_ble_api_types
Chris Manton [Sun, 20 Sep 2020 16:53:44 +0000 (09:53 -0700)]
Restore select #ifdefs stack/include/btm_ble_api_types

Certain targets require customization

Bug: 168969295
Tag: #refactor
Test: compile & builds
Change-Id: Icd2949b86a13d53cf5ae45fc1a66ab01618ddfe3

3 years agoenum-ify stack/include/::BT_DEVICE_TYPE_
Chris Manton [Thu, 17 Sep 2020 21:51:17 +0000 (14:51 -0700)]
enum-ify stack/include/::BT_DEVICE_TYPE_

Towards readable code

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

3 years agoenum-ify stack/include/btm_ble_api_types::tBTM_BLE_EVT
Chris Manton [Thu, 17 Sep 2020 23:50:12 +0000 (16:50 -0700)]
enum-ify stack/include/btm_ble_api_types::tBTM_BLE_EVT

Towards readable code

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

3 years agoUse correct typed values BTM_BLE
Chris Manton [Fri, 18 Sep 2020 00:11:20 +0000 (17:11 -0700)]
Use correct typed values BTM_BLE

BTM_BLE_CONNECT_EVT == BTM_BLE_ADV_IND_EVT == 0

btm_cb.ble_ctr_cb.inq_var.directed_conn

Towards readable code

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

3 years agoProperly reset btm_cb.ble_ctr_cb.inq_var.directed_conn
Chris Manton [Fri, 18 Sep 2020 00:05:42 +0000 (17:05 -0700)]
Properly reset btm_cb.ble_ctr_cb.inq_var.directed_conn

Towards readable code

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

3 years agoenum-ify BTM_BLE_ events
Chris Manton [Thu, 17 Sep 2020 23:31:31 +0000 (16:31 -0700)]
enum-ify BTM_BLE_ events

Towards readable code

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

3 years agoRemove unused #def and #ifdef stack/include/btm_ble_api_types
Chris Manton [Thu, 17 Sep 2020 23:45:44 +0000 (16:45 -0700)]
Remove unused #def and #ifdef stack/include/btm_ble_api_types

Towards readable code

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

3 years agoAdd stack/include/bt_types::DeviceTypeText
Chris Manton [Thu, 17 Sep 2020 23:20:40 +0000 (16:20 -0700)]
Add stack/include/bt_types::DeviceTypeText

Towards readable code

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

3 years agoenum-ify tBTM_BLE_RL_STATE
Chris Manton [Thu, 17 Sep 2020 21:28:57 +0000 (14:28 -0700)]
enum-ify tBTM_BLE_RL_STATE

Towards readable code

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

3 years agoAdd accessors for tBTM_CB::tBTM_BLE_CB::wl_state
Chris Manton [Tue, 8 Sep 2020 15:28:17 +0000 (08:28 -0700)]
Add accessors for tBTM_CB::tBTM_BLE_CB::wl_state

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I7b8210fd8577dfbc361ea4baf975b891605039ca

3 years agoRemove unused #defs stack/btm::
Chris Manton [Thu, 10 Sep 2020 17:30:36 +0000 (10:30 -0700)]
Remove unused #defs stack/btm::

Towards flattening BTM

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

3 years agoInternally link stack/acl::btm_ble_get_acl_remote_addr
Chris Manton [Thu, 17 Sep 2020 17:01:49 +0000 (10:01 -0700)]
Internally link stack/acl::btm_ble_get_acl_remote_addr

Towards readable code

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

Change-Id: I9a071851ad322cf9dc32945c351cee5bc1366f32

3 years agoUse btm_ble_[increment|decrement]_link_topology_mask
Chris Manton [Thu, 17 Sep 2020 21:13:55 +0000 (14:13 -0700)]
Use btm_ble_[increment|decrement]_link_topology_mask

Towards readable code

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

Change-Id: I7e3ea469d564bf4bf3778d30d59aabccdcdfdaf7

3 years agoAdd btm_ble_[increment|decrement]_link_topology_mask
Chris Manton [Thu, 17 Sep 2020 21:10:43 +0000 (14:10 -0700)]
Add btm_ble_[increment|decrement]_link_topology_mask

Towards readable code

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

Change-Id: I2528e8f0e87a40a07a379a28a9069589e2aa93eb

3 years agoInternally link stack/btm::ble_evt_type_is_
Chris Manton [Thu, 17 Sep 2020 18:06:30 +0000 (11:06 -0700)]
Internally link stack/btm::ble_evt_type_is_

Towards readable code

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

Change-Id: Ie6337dbe4aa9099bb4f41092672643d23619183d

3 years agoRework API btm_ble_select_adv_interval
Chris Manton [Thu, 17 Sep 2020 18:00:47 +0000 (11:00 -0700)]
Rework API btm_ble_select_adv_interval

Please Don't Pass Globals As Parameters

Towards readable code

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

Change-Id: If1d5f80cf12250b063a2ebe525527b6ddf6bfabc

3 years agoRework API btm_set_conn_mode_adv_init_addr
Chris Manton [Thu, 17 Sep 2020 17:55:42 +0000 (10:55 -0700)]
Rework API btm_set_conn_mode_adv_init_addr

Please Don't Pass Globals As Parameters

Towards readable code

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

Change-Id: I87db41af4155ee85f79b1d5944d3a882d0caf1ec

3 years agoRe-log /stack/btm/btm_ble::btm_ble_connected
Chris Manton [Thu, 17 Sep 2020 17:18:56 +0000 (10:18 -0700)]
Re-log /stack/btm/btm_ble::btm_ble_connected

Towards loggable code

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

Change-Id: I69a7bffa33eb0c650fbf2cdcfc73bff20494780f

3 years agoBreak out stack/gatt::on_connection_complete
Chris Manton [Thu, 17 Sep 2020 17:02:54 +0000 (10:02 -0700)]
Break out stack/gatt::on_connection_complete

Towards readable code

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

Change-Id: I30da4870897ade37a671021edb7722b062150d65

3 years agoMove connection_establishment into stack/acl
Chris Manton [Thu, 17 Sep 2020 16:34:06 +0000 (09:34 -0700)]
Move connection_establishment into stack/acl

Towards readable code

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

Change-Id: I6c64809c3a9770953ff41c9e3ac38d139a2fa8ea

3 years agoDowngrade device no longer discoverable to DEBUG
Chris Manton [Thu, 17 Sep 2020 00:45:26 +0000 (17:45 -0700)]
Downgrade device no longer discoverable to DEBUG

Was: Warning

Towards loggable code

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

Change-Id: Ib09ad9650d8b4aa6686fdce0c32a95084dd23e22

3 years agoMove connection_manager access into stack/acl/btm_acl
Chris Manton [Fri, 11 Sep 2020 15:10:50 +0000 (08:10 -0700)]
Move connection_manager access into stack/acl/btm_acl

Add acl layer between l2cap and connection_manager

From: stack/l2cap/l2c_ble

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest

Change-Id: I7680892626b81a90907a0071a016160fae3cb506