OSDN Git Service

android-x86/system-bt.git
3 years agoenum-ify stack/include/hcidefs::HCI_ROLE_ am: 6677e573d7
Chris Manton [Wed, 23 Sep 2020 06:19:46 +0000 (06:19 +0000)]
enum-ify stack/include/hcidefs::HCI_ROLE_ am: 6677e573d7

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1434993

Change-Id: Ifede4816744fb3112c866a9c993d5357a5b66688

3 years agoRe-Var stack/acl/btm_acl::btm_acl_created am: 437a21aede
Chris Manton [Wed, 23 Sep 2020 06:18:58 +0000 (06:18 +0000)]
Re-Var stack/acl/btm_acl::btm_acl_created am: 437a21aede

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1434992

Change-Id: I300dcd65515cdec1327ad401aa949734fa831f68

3 years agoMerge "SDP: We always use basic mode" am: 863b2e30aa
Treehugger Robot [Wed, 23 Sep 2020 04:05:17 +0000 (04:05 +0000)]
Merge "SDP: We always use basic mode" am: 863b2e30aa

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1434931

Change-Id: I0dc4c19cb154df25a7ad46d3c2b6422ae0315925

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." am: 022b3c1461
Treehugger Robot [Wed, 23 Sep 2020 03:27:28 +0000 (03:27 +0000)]
Merge "[fuzzing] Add liblog dependency." am: 022b3c1461

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1434997

Change-Id: I663aa958d1eef6c21c3f54b6558508015ade1d5a

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 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, ... am: bd7291ad19
Treehugger Robot [Tue, 22 Sep 2020 22:48:05 +0000 (22:48 +0000)]
Merge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ... am: bd7291ad19

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1434260

Change-Id: I8f4112d16014be6d7756da9c898d519cd921f4ab

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" am: a842768eb8
Jakub Pawlowski [Tue, 22 Sep 2020 21:23:15 +0000 (21:23 +0000)]
Merge "stack: Periodic advertising scanner implementation" am: a842768eb8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1353774

Change-Id: Ifa2344d78c59419db64f663dcb09ff473cd18689

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"" am: 2ba2de8ca1
Treehugger Robot [Tue, 22 Sep 2020 19:13:38 +0000 (19:13 +0000)]
Merge "Revert "HciHalTest: Handle EINTR when reading"" am: 2ba2de8ca1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1433884

Change-Id: I808b6706e61337ccdc9fe1dfdd94286e2af94578

3 years agoMerge "GD-HCI: Add verbose logging for Tx and Rx packets" am: 1789721f4e
Treehugger Robot [Tue, 22 Sep 2020 19:12:38 +0000 (19:12 +0000)]
Merge "GD-HCI: Add verbose logging for Tx and Rx packets" am: 1789721f4e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1433232

Change-Id: I28b5ec65ee7842018d3591c6c7b101109722eae7

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_ am: 5629a64e8f
Chris Manton [Tue, 22 Sep 2020 00:59:09 +0000 (00:59 +0000)]
Use acl ble stack/acl/::acl_ble_connection_ am: 5629a64e8f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1433065

Change-Id: Id183c1c85351c7ebdd8e450db1afed286c7580b9

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

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1433063

Change-Id: I93332c641377e15c9a21343d390a78a7581c6310

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" am: 1fac7a1259
Treehugger Robot [Mon, 21 Sep 2020 21:35:18 +0000 (21:35 +0000)]
Merge "Remove unneeded cflags and ldflags" am: 1fac7a1259

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432813

Change-Id: Ic2477ef379632b74878a037532519df61fd07d0f

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 agoMerge "HciHalTest: Handle EINTR when reading" am: a5ee51c390
Myles Watson [Mon, 21 Sep 2020 20:14:54 +0000 (20:14 +0000)]
Merge "HciHalTest: Handle EINTR when reading" am: a5ee51c390

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1433064

Change-Id: I3f58638f3fa5836e73e090db6344aeabf7c030f1

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 agoRevert "Remove unused #def and #ifdef stack/include/btm_ble_api_types" am: 22e219611c
Robin Lee [Mon, 21 Sep 2020 19:43:00 +0000 (19:43 +0000)]
Revert "Remove unused #def and #ifdef stack/include/btm_ble_api_types" am: 22e219611c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432691

Change-Id: I70a3f193743218388a0f44482b132fa62a5e4c64

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" am: 72ead1c0db
Treehugger Robot [Mon, 21 Sep 2020 05:35:22 +0000 (05:35 +0000)]
Merge "Add ext prop value into hash calculation" am: 72ead1c0db

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1429903

Change-Id: If5f5dcef4075a0a310f3c48686888c2d2204e020

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 am: ab7987b336
Chris Manton [Sun, 20 Sep 2020 21:37:11 +0000 (21:37 +0000)]
Restore select #ifdefs stack/include/btm_ble_api_types am: ab7987b336

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432391

Change-Id: I5599b306191787cf06d655ccf83497f9deb7b012

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_ am: 70bbd91fc8
Chris Manton [Sun, 20 Sep 2020 00:18:51 +0000 (00:18 +0000)]
enum-ify stack/include/::BT_DEVICE_TYPE_ am: 70bbd91fc8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432323

Change-Id: I4dfc30d7369e7f990f214a6752e0b6b47164c45d

3 years agoenum-ify stack/include/btm_ble_api_types::tBTM_BLE_EVT am: 46e5e4c2c2
Chris Manton [Sun, 20 Sep 2020 00:18:47 +0000 (00:18 +0000)]
enum-ify stack/include/btm_ble_api_types::tBTM_BLE_EVT am: 46e5e4c2c2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432322

Change-Id: I0da9f0bfd81ccf1c8bc48151d0b8694af037ab7c

3 years agoUse correct typed values BTM_BLE am: 5f4e6cade7
Chris Manton [Sun, 20 Sep 2020 00:18:43 +0000 (00:18 +0000)]
Use correct typed values BTM_BLE am: 5f4e6cade7

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432321

Change-Id: I3c551ea922e368a29b608a518b279bfcb6255a8d

3 years agoProperly reset btm_cb.ble_ctr_cb.inq_var.directed_conn am: 91ef9e7ce4
Chris Manton [Sun, 20 Sep 2020 00:18:39 +0000 (00:18 +0000)]
Properly reset btm_cb.ble_ctr_cb.inq_var.directed_conn am: 91ef9e7ce4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432320

Change-Id: I5718e50d2b5fb7c08695333d8ec27e48867a93e1

3 years agoenum-ify BTM_BLE_ events am: d12b086728
Chris Manton [Sun, 20 Sep 2020 00:18:35 +0000 (00:18 +0000)]
enum-ify BTM_BLE_ events am: d12b086728

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432319

Change-Id: Ic2fbfe9f15cab73c7561d395dda3722b3cb79e60

3 years agoRemove unused #def and #ifdef stack/include/btm_ble_api_types am: bb15392871
Chris Manton [Sun, 20 Sep 2020 00:18:31 +0000 (00:18 +0000)]
Remove unused #def and #ifdef stack/include/btm_ble_api_types am: bb15392871

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432318

Change-Id: I33793def992ab091b1e89c19d11a7a2478a38287

3 years agoAdd stack/include/bt_types::DeviceTypeText am: 59726a54fd
Chris Manton [Sun, 20 Sep 2020 00:18:27 +0000 (00:18 +0000)]
Add stack/include/bt_types::DeviceTypeText am: 59726a54fd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432317

Change-Id: I8639fb26d5afa200b861f893f4094f52f2b2faeb

3 years agoenum-ify tBTM_BLE_RL_STATE am: 2eb93aa713
Chris Manton [Sun, 20 Sep 2020 00:18:23 +0000 (00:18 +0000)]
enum-ify tBTM_BLE_RL_STATE am: 2eb93aa713

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432316

Change-Id: I63340a7bc0fb1ba990c6688b5a191ec9432daf0e

3 years agoAdd accessors for tBTM_CB::tBTM_BLE_CB::wl_state am: 962988c255
Chris Manton [Sun, 20 Sep 2020 00:18:19 +0000 (00:18 +0000)]
Add accessors for tBTM_CB::tBTM_BLE_CB::wl_state am: 962988c255

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1432315

Change-Id: I156f8cc5d347e30c16ea7592e34c2f8f13885dd4

3 years agoRemove unused #defs stack/btm:: am: fa2f60578b
Chris Manton [Sun, 20 Sep 2020 00:17:36 +0000 (00:17 +0000)]
Remove unused #defs stack/btm:: am: fa2f60578b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1425783

Change-Id: I568ffc6a51e89a9803bf68d6e8d0399a575c3075

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 am: 58b9be4c64
Chris Manton [Sat, 19 Sep 2020 07:58:17 +0000 (07:58 +0000)]
Internally link stack/acl::btm_ble_get_acl_remote_addr am: 58b9be4c64

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431926

Change-Id: I8894f74d93bb249e46cc3a19b43adf06e8dc9e48

3 years agoUse btm_ble_[increment|decrement]_link_topology_mask am: f10f7c7acd
Chris Manton [Sat, 19 Sep 2020 07:58:14 +0000 (07:58 +0000)]
Use btm_ble_[increment|decrement]_link_topology_mask am: f10f7c7acd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431925

Change-Id: Ie047d22bfc78dc8ce8eca17769196361babd6889

3 years agoAdd btm_ble_[increment|decrement]_link_topology_mask am: 37576d9f52
Chris Manton [Sat, 19 Sep 2020 07:58:10 +0000 (07:58 +0000)]
Add btm_ble_[increment|decrement]_link_topology_mask am: 37576d9f52

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431924

Change-Id: I27fb2ada60f9bc95b67a5dfec719636690154601

3 years agoInternally link stack/btm::ble_evt_type_is_ am: d090b34fbf
Chris Manton [Sat, 19 Sep 2020 07:58:07 +0000 (07:58 +0000)]
Internally link stack/btm::ble_evt_type_is_ am: d090b34fbf

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431923

Change-Id: I7a9799f877f9005face1743c0b75a33b0bec9b4d

3 years agoRework API btm_ble_select_adv_interval am: fc63e460db
Chris Manton [Sat, 19 Sep 2020 07:58:02 +0000 (07:58 +0000)]
Rework API btm_ble_select_adv_interval am: fc63e460db

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431922

Change-Id: I3f1e8c81d20e3d6e1f2b05258795c4ba02131919

3 years agoRework API btm_set_conn_mode_adv_init_addr am: 7be3e62a36
Chris Manton [Sat, 19 Sep 2020 07:57:44 +0000 (07:57 +0000)]
Rework API btm_set_conn_mode_adv_init_addr am: 7be3e62a36

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431921

Change-Id: If01409935d7426c95a48bdc3a0ba063907f93079

3 years agoRe-log /stack/btm/btm_ble::btm_ble_connected am: e0ea6fc416
Chris Manton [Sat, 19 Sep 2020 07:56:49 +0000 (07:56 +0000)]
Re-log /stack/btm/btm_ble::btm_ble_connected am: e0ea6fc416

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431920

Change-Id: Ic08e55827a43a590cbc54dad0e62af8e48379ba9

3 years agoBreak out stack/gatt::on_connection_complete am: abf76050b2
Chris Manton [Sat, 19 Sep 2020 07:55:29 +0000 (07:55 +0000)]
Break out stack/gatt::on_connection_complete am: abf76050b2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431919

Change-Id: Ib9b6e67fbe46725e65b207e27f95f5e4949b6f0d

3 years agoMove connection_establishment into stack/acl am: f590686a9c
Chris Manton [Sat, 19 Sep 2020 07:54:04 +0000 (07:54 +0000)]
Move connection_establishment into stack/acl am: f590686a9c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431918

Change-Id: Ibb400a84aa2b329b0fa20d7dde098f29798d61a9

3 years agoDowngrade device no longer discoverable to DEBUG am: dd0664b89f
Chris Manton [Sat, 19 Sep 2020 07:51:47 +0000 (07:51 +0000)]
Downgrade device no longer discoverable to DEBUG am: dd0664b89f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431917

Change-Id: I1492e634ded610f532d408349115eb64bab02398

3 years agoMove connection_manager access into stack/acl/btm_acl am: 3ab08b3d4e
Chris Manton [Sat, 19 Sep 2020 07:06:45 +0000 (07:06 +0000)]
Move connection_manager access into stack/acl/btm_acl am: 3ab08b3d4e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431916

Change-Id: I4af946db2577f00390968a152c2e586f71fffc64

3 years agoRemove immaterial stack/btu/btu_hcif::HCI_TRACE_EVENT am: 3726f16a07
Chris Manton [Sat, 19 Sep 2020 07:06:41 +0000 (07:06 +0000)]
Remove immaterial stack/btu/btu_hcif::HCI_TRACE_EVENT am: 3726f16a07

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431915

Change-Id: I67e8c753c7291e2b370c659156b3a7e42cc22c54

3 years agoRemove immaterial stack/btu/btm_ble_addr::BTM_TRACE_EVENT am: f4f5f001bd
Chris Manton [Sat, 19 Sep 2020 07:06:37 +0000 (07:06 +0000)]
Remove immaterial stack/btu/btm_ble_addr::BTM_TRACE_EVENT am: f4f5f001bd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431914

Change-Id: Icc4f124fb41d161ec5971d2bd77ce287000792d0

3 years agoAdd text hci error code logging am: 2804ace494
Chris Manton [Sat, 19 Sep 2020 07:06:32 +0000 (07:06 +0000)]
Add text hci error code logging am: 2804ace494

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431913

Change-Id: Iffc865b561cac8db68f467ec35c739b3d4a44ffb

3 years agoAdd getters to stack/btm/security_device_record::tBTM_SEC_DEV_REC am: 6546112126
Chris Manton [Sat, 19 Sep 2020 07:06:20 +0000 (07:06 +0000)]
Add getters to stack/btm/security_device_record::tBTM_SEC_DEV_REC am: 6546112126

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431912

Change-Id: I054040bc85d27cded39cf816c95cb2ba64f1d316

3 years agoRemove useless #def BTM_IS_BRCM_CONTROLLER am: 7e98d99e37
Chris Manton [Sat, 19 Sep 2020 07:06:00 +0000 (07:06 +0000)]
Remove useless #def BTM_IS_BRCM_CONTROLLER am: 7e98d99e37

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431911

Change-Id: I4d24814b28a69cf01ded4906282d006b618b8469

3 years agoMove BTM_IS_BRCM_CONTROLLER to end usecase am: 53f16c1918
Chris Manton [Sat, 19 Sep 2020 07:05:36 +0000 (07:05 +0000)]
Move BTM_IS_BRCM_CONTROLLER to end usecase am: 53f16c1918

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431910

Change-Id: Ie0e0dfa7031d3553fa7562540481fe4041e22acc

3 years agoRemove unused #defs _DM_LE_KEY_ am: 49ef817b63
Chris Manton [Sat, 19 Sep 2020 07:05:06 +0000 (07:05 +0000)]
Remove unused #defs _DM_LE_KEY_ am: 49ef817b63

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431909

Change-Id: If411ee54fd0c2a0d632aaefc4bec0631cb784da3

3 years agoRemove unnecessary #def BTA_LE_KEY_ am: 30de55bca1
Chris Manton [Sat, 19 Sep 2020 07:03:47 +0000 (07:03 +0000)]
Remove unnecessary #def BTA_LE_KEY_ am: 30de55bca1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1431908

Change-Id: I8971baac1d1e90c539384854e04adab8c596466b

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