OSDN Git Service
Chris Manton [Wed, 23 Sep 2020 06:57:49 +0000 (06:57 +0000)]
Re-Var stack/acl/btm_acl::btm_acl_created am:
437a21aede am:
c612c8948b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434992
Change-Id: I80ab22e6ecb7a6b12c3e5e6c4a52df0de2bcbc1f
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
Treehugger Robot [Wed, 23 Sep 2020 04:13:37 +0000 (04:13 +0000)]
Merge "SDP: We always use basic mode" am:
863b2e30aa am:
eb2b9ed70c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434931
Change-Id: I41322c83179c2bca7cbbc1f32a6fcbf86a54e27e
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
Treehugger Robot [Wed, 23 Sep 2020 04:05:15 +0000 (04:05 +0000)]
Merge "[fuzzing] Add liblog dependency." am:
022b3c1461 am:
97c1f6a6b7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434997
Change-Id: Id7192326dda143e2ef972a54cda75e0adee6b0ea
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
Treehugger Robot [Wed, 23 Sep 2020 03:47:51 +0000 (03:47 +0000)]
Merge "SDP: We always use basic mode"
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
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 23:08:29 +0000 (23:08 +0000)]
Merge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ... am:
bd7291ad19 am:
090d096d84
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434260
Change-Id: I32bc4d31f4e1e814682d5137613549e57af73c19
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
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
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:41:55 +0000 (21:41 +0000)]
Merge "stack: Periodic advertising scanner implementation" am:
a842768eb8 am:
692111f292
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1353774
Change-Id: I5c02a59aac36935900abae9687e914d2ca16f985
Jakub Pawlowski [Tue, 22 Sep 2020 21:31:41 +0000 (21:31 +0000)]
Merge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev am:
a6d074922e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12628928
Change-Id: I2608dcb1c9c9031bacfaba1b715974d9f98c7391
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
Jakub Pawlowski [Tue, 22 Sep 2020 21:14:20 +0000 (21:14 +0000)]
Merge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev
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:32:37 +0000 (19:32 +0000)]
Merge "Revert "HciHalTest: Handle EINTR when reading"" am:
2ba2de8ca1 am:
c64548e4ca
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1433884
Change-Id: I4f2fc0fc24c3bde812524ad2ccac50b578b3233f
Treehugger Robot [Tue, 22 Sep 2020 19:32:14 +0000 (19:32 +0000)]
Merge "GD-HCI: Add verbose logging for Tx and Rx packets" am:
1789721f4e am:
bc71fa5b28
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1433232
Change-Id: I96968f3513c9e553641e23739eebf1fe37844b08
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
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
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 [Tue, 22 Sep 2020 01:40:35 +0000 (01:40 +0000)]
Use acl ble stack/acl/::acl_ble_connection_ am:
5629a64e8f am:
7c863c0633
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1433065
Change-Id: Ibe6dc8fdcc5cdb1ac9a2d91c70bee6908f00868b
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
TreeHugger Robot [Tue, 22 Sep 2020 00:31:25 +0000 (00:31 +0000)]
[automerger skipped] Merge "HciHalRootCanalTest: Use ASSERT and retry reads" into rvc-dev am:
ae8049033b -s ours
am skip reason: Change-Id I4a69e172eda911e24ecf7482cd88a724139ca29d with SHA-1
3478451ff1 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12654144
Change-Id: I3d2afbf2ce786038680a9dae4296a4ca41643ef2
TreeHugger Robot [Tue, 22 Sep 2020 00:07:05 +0000 (00:07 +0000)]
Merge "HciHalRootCanalTest: Use ASSERT and retry reads" into rvc-dev
Treehugger Robot [Mon, 21 Sep 2020 22:57:09 +0000 (22:57 +0000)]
Merge changes I9c6cce21,I808a6fd2,I263e4cfd,I522fcfa3,I6abb2319, ... am:
b162b52cd7 am:
e4f6f1ecdf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1433063
Change-Id: I53378d33c113ce2378cbf63b32313975caccf6cb
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
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:04:05 +0000 (22:04 +0000)]
Merge "Remove unneeded cflags and ldflags" am:
1fac7a1259 am:
5a9e0359a9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432813
Change-Id: I4ff7a38a1e9291324cc7ba6565db28041bfc31fa
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: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
Treehugger Robot [Mon, 21 Sep 2020 21:19:40 +0000 (21:19 +0000)]
Merge "Remove unneeded cflags and ldflags"
Myles Watson [Mon, 21 Sep 2020 21:05:07 +0000 (21:05 +0000)]
Merge "HciHalTest: Handle EINTR when reading" am:
a5ee51c390 am:
4240d3e2f7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1433064
Change-Id: I6e652cfe63ae4bd4f1fecace30c2902ea666251d
Myles Watson [Sat, 9 May 2020 13:38:57 +0000 (06:38 -0700)]
HciHalRootCanalTest: Use ASSERT and retry reads
Tag: #gd-refactor
Bug:
156148686
Test: atest bluetooth_test_gd
(while building Android)
Change-Id: I4a69e172eda911e24ecf7482cd88a724139ca29d
Merged-In: I4a69e172eda911e24ecf7482cd88a724139ca29d
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
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
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
Robin Lee [Mon, 21 Sep 2020 20:08:53 +0000 (20:08 +0000)]
Revert "Remove unused #def and #ifdef stack/include/btm_ble_api_types" am:
22e219611c am:
f1c36e2525
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432691
Change-Id: I97a658febc5b8e997093a380c63c2fbd0c1e4b54
Myles Watson [Mon, 21 Sep 2020 19:50:04 +0000 (19:50 +0000)]
Merge "HciHalTest: Handle EINTR when reading"
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
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:55:45 +0000 (05:55 +0000)]
Merge "Add ext prop value into hash calculation" am:
72ead1c0db am:
8d027f439e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1429903
Change-Id: Icacdc2be4ae74128c4597472b3ae2f96d07c19b5
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
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 22:14:04 +0000 (22:14 +0000)]
Restore select #ifdefs stack/include/btm_ble_api_types am:
ab7987b336 am:
8dbb5d0804
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432391
Change-Id: I87758f593418f65abc95967529e0559d3e535fc3
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
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 [Sun, 20 Sep 2020 00:54:14 +0000 (00:54 +0000)]
enum-ify stack/include/::BT_DEVICE_TYPE_ am:
70bbd91fc8 am:
cb88ef6584
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432323
Change-Id: I9e0929dc4b6860b9c4a595dd9a12c9d7c437c788
Chris Manton [Sun, 20 Sep 2020 00:54:11 +0000 (00:54 +0000)]
enum-ify stack/include/btm_ble_api_types::tBTM_BLE_EVT am:
46e5e4c2c2 am:
f5c4c05208
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432322
Change-Id: I01c7063770f3ca8d4b20c7dc4a9937ae99477bf3
Chris Manton [Sun, 20 Sep 2020 00:54:10 +0000 (00:54 +0000)]
Use correct typed values BTM_BLE am:
5f4e6cade7 am:
745e56415f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432321
Change-Id: I10b2a2f8957110862e818bb6ff9dbfe720d687c1
Chris Manton [Sun, 20 Sep 2020 00:54:08 +0000 (00:54 +0000)]
Properly reset btm_cb.ble_ctr_cb.inq_var.directed_conn am:
91ef9e7ce4 am:
85ccac685d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432320
Change-Id: I1b9c3025fd79ef3d5fbc4498c7a4bbd2afb4e026
Chris Manton [Sun, 20 Sep 2020 00:54:06 +0000 (00:54 +0000)]
enum-ify BTM_BLE_ events am:
d12b086728 am:
f9783afefa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432319
Change-Id: I38a58ef682274880dccba4bdfd3db4046e35084f
Chris Manton [Sun, 20 Sep 2020 00:54:04 +0000 (00:54 +0000)]
Remove unused #def and #ifdef stack/include/btm_ble_api_types am:
bb15392871 am:
35fe157f64
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432318
Change-Id: I44008c86ae6fb8757c0bd73f5e012b370df86162
Chris Manton [Sun, 20 Sep 2020 00:54:02 +0000 (00:54 +0000)]
Add stack/include/bt_types::DeviceTypeText am:
59726a54fd am:
7635d3c580
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432317
Change-Id: I1dee78c198d9425276ea3e98c76d55d5b01e1878
Chris Manton [Sun, 20 Sep 2020 00:54:00 +0000 (00:54 +0000)]
enum-ify tBTM_BLE_RL_STATE am:
2eb93aa713 am:
8e59b153f5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432316
Change-Id: I07cfc35e887d11f91a813cfe15aec514c40c535e
Chris Manton [Sun, 20 Sep 2020 00:53:58 +0000 (00:53 +0000)]
Add accessors for tBTM_CB::tBTM_BLE_CB::wl_state am:
962988c255 am:
4a29a4207d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432315
Change-Id: Ie3043898c8f2d63c92780dfd02225c2b69cebe05
Chris Manton [Sun, 20 Sep 2020 00:53:56 +0000 (00:53 +0000)]
Remove unused #defs stack/btm:: am:
fa2f60578b am:
70aa43fa40
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1425783
Change-Id: I031aaf3a82972a46607dd6d8144d7f361bb90b0d
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
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
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
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
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
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
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
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
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
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
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