OSDN Git Service
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
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"
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
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: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 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: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
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 [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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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, 17 Sep 2020 22:52:53 +0000 (22:52 +0000)]
Remove unnecessary #def BTIF_DM_LE_KEY_ am:
2e8b1e2426
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1430109
Change-Id: Ib4d250320dfe4b084e5e2799f15b28c6a71f426f
Chris Manton [Thu, 17 Sep 2020 19:43:14 +0000 (19:43 +0000)]
Remove unused #defs stack/include/sdpdefs:: am:
c14df7b3f9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1430108
Change-Id: Ibcc57233e337c3a1d5f958b7bc71cb901476cf95
Chris Manton [Thu, 17 Sep 2020 19:43:10 +0000 (19:43 +0000)]
Log "device" btif/src/btif_config.c::btif_get_device_type am:
f4b14ac760
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1426430
Change-Id: I99e2d8b7fc19cdacb1a6b44d73b714a91261ef1b
Chris Manton [Thu, 17 Sep 2020 19:42:23 +0000 (19:42 +0000)]
Remove unused #def BTM_MAX_VENDOR_SPECIFIC_LEN am:
1873a2babd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1426429
Change-Id: Ibf24011460153c0149568795f633f4b704ccfe52
Chris Manton [Thu, 17 Sep 2020 19:42:19 +0000 (19:42 +0000)]
Set default tag to 'bluetooth' am:
92b756348f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1426428
Change-Id: Ieb78a8a6d0d621dcfbfabfaaa8edd61a03b1c4ee
Chris Manton [Thu, 17 Sep 2020 19:41:47 +0000 (19:41 +0000)]
Replace #def btif/src/btif_sock_thread::APPL_TRACE_DEBUG am:
976d99b20c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1425787
Change-Id: I6e33e8d48f9b21f5cbe54539604f246a2e3d7a2c
Chris Manton [Thu, 17 Sep 2020 19:40:50 +0000 (19:40 +0000)]
Remove unused #defs bta/include/bta_api:: am:
2b12241ab3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1425785
Change-Id: Ie22180b2242603eacacfe69c299de052f041f491
Chris Manton [Thu, 17 Sep 2020 19:39:20 +0000 (19:39 +0000)]
Remove unused #defs stack/smp:: am:
8fead02f91
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1425784
Change-Id: Iba3a35a0f35e6ab79f14b2b43d3ad312ed745cba
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
OSDN Git Service
