OSDN Git Service
Treehugger Robot [Wed, 23 Sep 2020 03:03:01 +0000 (03:03 +0000)]
Merge "[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
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
Jakub Pawlowski [Tue, 22 Sep 2020 21:08:44 +0000 (21:08 +0000)]
Merge "stack: Periodic advertising scanner implementation"
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
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
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
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
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
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
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
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
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
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
Treehugger Robot [Tue, 22 Sep 2020 19:01:47 +0000 (19:01 +0000)]
Merge "Revert "HciHalTest: Handle EINTR when reading""
Treehugger Robot [Tue, 22 Sep 2020 18:51:25 +0000 (18:51 +0000)]
Merge "GD-HCI: Add verbose logging for Tx and Rx packets"
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
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
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
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
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
Treehugger Robot [Mon, 21 Sep 2020 21:19:40 +0000 (21:19 +0000)]
Merge "Remove unneeded cflags and ldflags"
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
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
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
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
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
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
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
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
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
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
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
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
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
Myles Watson [Mon, 21 Sep 2020 19:50:04 +0000 (19:50 +0000)]
Merge "HciHalTest: 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
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
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
Treehugger Robot [Mon, 21 Sep 2020 05:21:48 +0000 (05:21 +0000)]
Merge "Add ext prop value into hash calculation"
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Chris Manton [Sun, 13 Sep 2020 22:46:17 +0000 (15:46 -0700)]
Remove immaterial stack/btu/btu_hcif::HCI_TRACE_EVENT
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I66d31272ac21c4a60d92e5d862514cf248728e83
Chris Manton [Sun, 13 Sep 2020 22:48:50 +0000 (15:48 -0700)]
Remove immaterial stack/btu/btm_ble_addr::BTM_TRACE_EVENT
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I40a0ed7e015e55e56b389011038f5323666a4f1b
Chris Manton [Mon, 14 Sep 2020 17:17:32 +0000 (10:17 -0700)]
Add text hci error code logging
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Idc6801ba860a4f96554431c1dbd408a8e651a6e1
Chris Manton [Mon, 7 Sep 2020 16:37:31 +0000 (09:37 -0700)]
Add getters to stack/btm/security_device_record::tBTM_SEC_DEV_REC
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Ia024a6977d606714f7edc58ded09f82a95703324
Chris Manton [Thu, 10 Sep 2020 23:25:36 +0000 (16:25 -0700)]
Remove useless #def BTM_IS_BRCM_CONTROLLER
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Ic3f54bab7f13cde30b3089ca41bc5b4b1e33a2e8
Chris Manton [Thu, 10 Sep 2020 23:23:45 +0000 (16:23 -0700)]
Move BTM_IS_BRCM_CONTROLLER to end usecase
From: stack/btm/security_device_record.h
Into: stack/l2cap/l2c_utils.cc
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I4c69507efdabc35d7e7f393ac3e92481a0666d98
Chris Manton [Thu, 10 Sep 2020 21:53:43 +0000 (14:53 -0700)]
Remove unused #defs _DM_LE_KEY_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Id8ea36ffcd227d522282a7ff24997e5c29bca4c8
Chris Manton [Thu, 10 Sep 2020 20:50:24 +0000 (13:50 -0700)]
Remove unnecessary #def BTA_LE_KEY_
=>BTM_LE_KEY_
BTM_LE_KEY_PENC == BTA_LE_KEY_PENC == BTIF_DM_LE_KEY_PENC
BTM_LE_KEY_PID == BTA_LE_KEY_PID == BTIF_DM_LE_KEY_PID
BTM_LE_KEY_PCSRK == BTA_LE_KEY_PCSRK == BTIF_DM_LE_KEY_PCSRK
BTM_LE_KEY_LENC == BTA_LE_KEY_LENC == BTIF_DM_LE_KEY_LENC
BTM_LE_KEY_LID == BTA_LE_KEY_LID == BTIF_DM_LE_KEY_LID
BTM_LE_KEY_LCSRK == BTA_LE_KEY_LCSRK == BTIF_DM_LE_KEY_LCSRK
Towards fewer aliases
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: If4295f807a8b05c35ce4dbb333973730d9f77221
HsingYuan Lo [Fri, 18 Sep 2020 07:20:30 +0000 (15:20 +0800)]
Add ext prop value into hash calculation
Test: atest net_test_bta net_test_stack_gatt_sr_hash_native
Tag: #feature
Bug:
154056389
Change-Id: I3262d0648a37accdf74ac5c77f38c8248c3f7105
Chris Manton [Thu, 10 Sep 2020 20:40:36 +0000 (13:40 -0700)]
Remove unnecessary #def BTIF_DM_LE_KEY_
=>BTM_LE_KEY_
BTM_LE_KEY_PENC == BTA_LE_KEY_PENC == BTIF_DM_LE_KEY_PENC
BTM_LE_KEY_PID == BTA_LE_KEY_PID == BTIF_DM_LE_KEY_PID
BTM_LE_KEY_PCSRK == BTA_LE_KEY_PCSRK == BTIF_DM_LE_KEY_PCSRK
BTM_LE_KEY_LENC == BTA_LE_KEY_LENC == BTIF_DM_LE_KEY_LENC
BTM_LE_KEY_LID == BTA_LE_KEY_LID == BTIF_DM_LE_KEY_LID
BTM_LE_KEY_LCSRK == BTA_LE_KEY_LCSRK == BTIF_DM_LE_KEY_LCSRK
Towards fewer aliases
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8e0acad049b7c5d816a5244825bcd0b9028e3a25
Chris Manton [Thu, 10 Sep 2020 18:09:32 +0000 (11:09 -0700)]
Remove unused #defs stack/include/sdpdefs::
Towards flattening Everything
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifd2a529f0d3a73a024a7c38f2bf0c59918371a02
Chris Manton [Wed, 9 Sep 2020 23:13:50 +0000 (16:13 -0700)]
Log "device" btif/src/btif_config.c::btif_get_device_type
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ied237375c1dd9ceeab483f5af4b9f61637e9779c
Chris Manton [Wed, 9 Sep 2020 06:02:06 +0000 (23:02 -0700)]
Remove unused #def BTM_MAX_VENDOR_SPECIFIC_LEN
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If93c2b232e9736728fd4dccc2a10bfa9fbf1365b
Chris Manton [Sat, 12 Sep 2020 23:26:35 +0000 (16:26 -0700)]
Set default tag to 'bluetooth'
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I65fbd9338482300e176e5afbd904a34e363e92bb
Chris Manton [Sat, 12 Sep 2020 21:47:10 +0000 (14:47 -0700)]
Replace #def btif/src/btif_sock_thread::APPL_TRACE_DEBUG
Useless information emitted
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iadbfd57310e7e592a47aa4502a089316cb36610f
Chris Manton [Thu, 10 Sep 2020 16:50:09 +0000 (09:50 -0700)]
Remove unused #defs bta/include/bta_api::
Towards flattening BTA
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic16b804cd1b7356a8d3a7a59ede0b092cd3eee7d
Chris Manton [Thu, 10 Sep 2020 17:45:23 +0000 (10:45 -0700)]
Remove unused #defs stack/smp::
Towards flattening SMP
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic9d5cca65372dcf73fd44dfdacac8b92d59e3f33
HsingYuan Lo [Thu, 17 Sep 2020 08:54:04 +0000 (16:54 +0800)]
Refactor adding ext prop descriptor
In oder to make db hash easier for unit testing
1. Creare a new API to add ext prop descriptor
2. Move the extended properties check to gatt_api.cc
Test: compile
Tag: #refactor
Bug:
110864501
Change-Id: I7afd748e3cd6f6588a30c0f255da4f2ab4b9376c
Treehugger Robot [Wed, 16 Sep 2020 23:43:59 +0000 (23:43 +0000)]
Merge "SDP_SERVER_ENABLED is always true"
Treehugger Robot [Wed, 16 Sep 2020 18:28:21 +0000 (18:28 +0000)]
Merge "gd: Change AdvertiserId type to uint8_t"
Treehugger Robot [Wed, 16 Sep 2020 18:28:16 +0000 (18:28 +0000)]
Merge "gd: add shim layer for LE advertising manager"
Treehugger Robot [Wed, 16 Sep 2020 18:27:44 +0000 (18:27 +0000)]
Merge "gd: add LE advertising callback"
Hansong Zhang [Wed, 9 Sep 2020 20:07:47 +0000 (13:07 -0700)]
SDP_SERVER_ENABLED is always true
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I22fa27b8eeab933b4529e6dec423327721428d8f
Chienyuan [Wed, 16 Sep 2020 09:10:43 +0000 (17:10 +0800)]
gd: Change AdvertiserId type to uint8_t
Tag: #gd-refactor
Bug:
159815595
Test: gd/cert/run --host
Change-Id: Ie0aaaebe89e712c648a3be0217d2a2394a5a9085
Chienyuan [Tue, 15 Sep 2020 12:05:42 +0000 (20:05 +0800)]
gd: add shim layer for LE advertising manager
Tag: #refactor
Bug:
159815595
Test: manual
Change-Id: Ib969d1ffe17c97b326d5553da3b054461e1039af
Chienyuan [Tue, 15 Sep 2020 09:43:14 +0000 (17:43 +0800)]
gd: add LE advertising callback
Tag: #gd-refactor
Bug:
159815595
Test: gd/cert/run --host
Change-Id: I780bbe31b28374f18feb353250c1ef7c5b253e8d
Chris Manton [Sat, 5 Sep 2020 19:24:46 +0000 (12:24 -0700)]
Fix likely-unhit memory leak
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I0cbaf43e04b42468c8588d0dd8b13001ee10229d
Chris Manton [Wed, 9 Sep 2020 15:39:48 +0000 (08:39 -0700)]
Remove #def code conditional BT_MAX_SERVICE_NAME_LEN
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: I1e3c7848932ba160411c86243b374d7b5f84403c
Chris Manton [Wed, 9 Sep 2020 15:37:22 +0000 (08:37 -0700)]
Replace #def BTM_SEC_SERVICE_NAME_LEN
BTM_SEC_SERVICE_NAME_LEN == BT_MAX_SERVICE_NAME_LEN
Use: BT_MAX_SERVICE_NAME_LEN
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I60e08e99d10cd2521beb7bbeaffe2263eabdd22d
Chris Manton [Tue, 8 Sep 2020 05:51:14 +0000 (22:51 -0700)]
Add header declarations
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Ic0897e2cbfe1a61697d3837fceb40138b60783c2
Chris Manton [Thu, 3 Sep 2020 16:41:47 +0000 (09:41 -0700)]
Remove unused def L2CAP_WAKE_PARKED_LINK
Because when false untested hence unsupported
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Ie24b10ed24230616f9f086b2463b09c37eb57e6f
Chris Manton [Fri, 4 Sep 2020 17:47:35 +0000 (10:47 -0700)]
Remove unused return val btif/src::btsock_thread_init
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Iddcc2af04bc397eedb29e9ddaf78abf8215ac045
Treehugger Robot [Tue, 15 Sep 2020 19:52:40 +0000 (19:52 +0000)]
Merge "bnep_disconnect_cfm does nothing"
Treehugger Robot [Tue, 15 Sep 2020 19:52:16 +0000 (19:52 +0000)]
Merge "Remove the empty line"
Treehugger Robot [Tue, 15 Sep 2020 18:27:26 +0000 (18:27 +0000)]
Merge "GD Reactor: Fix a potential use-after-free"
Treehugger Robot [Tue, 15 Sep 2020 13:11:44 +0000 (13:11 +0000)]
Merge "RootCanal: Add Iso command support for CIG/CIS"
Hansong Zhang [Mon, 14 Sep 2020 22:17:07 +0000 (15:17 -0700)]
GD Reactor: Fix a potential use-after-free
When a Reactable is freed, we cannot unlock its internal mutex.
Bug:
168271357
Tag: #gd-refactor
Test: cert/run --host
Change-Id: I4606965f0f3a73411068311fcaced570627e9679
Hansong Zhang [Mon, 14 Sep 2020 20:12:09 +0000 (13:12 -0700)]
Remove the empty line
To avoid a merge conflict
Test: compile
Change-Id: I7cab2bd47574850e390ffc3673eaeb3d2941ef24