OSDN Git Service

android-x86/system-bt.git
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/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

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

Towards readable code

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

Change-Id: I7e3ea469d564bf4bf3778d30d59aabccdcdfdaf7

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

Towards readable code

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

Change-Id: I2528e8f0e87a40a07a379a28a9069589e2aa93eb

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

Towards readable code

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

Change-Id: Ie6337dbe4aa9099bb4f41092672643d23619183d

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

Please Don't Pass Globals As Parameters

Towards readable code

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

Change-Id: If1d5f80cf12250b063a2ebe525527b6ddf6bfabc

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

Please Don't Pass Globals As Parameters

Towards readable code

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

Change-Id: I87db41af4155ee85f79b1d5944d3a882d0caf1ec

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

Towards loggable code

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

Change-Id: I69a7bffa33eb0c650fbf2cdcfc73bff20494780f

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

Towards readable code

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

Change-Id: I30da4870897ade37a671021edb7722b062150d65

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

Towards readable code

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

Change-Id: I6c64809c3a9770953ff41c9e3ac38d139a2fa8ea

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

Was: Warning

Towards loggable code

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

Change-Id: Ib09ad9650d8b4aa6686fdce0c32a95084dd23e22

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

Add acl layer between l2cap and connection_manager

From: stack/l2cap/l2c_ble

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

Change-Id: I7680892626b81a90907a0071a016160fae3cb506

3 years agoRemove immaterial stack/btu/btu_hcif::HCI_TRACE_EVENT
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

3 years agoRemove immaterial stack/btu/btm_ble_addr::BTM_TRACE_EVENT
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

3 years agoAdd text hci error code logging
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

3 years agoAdd getters to stack/btm/security_device_record::tBTM_SEC_DEV_REC
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

3 years agoRemove useless #def BTM_IS_BRCM_CONTROLLER
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

3 years agoMove BTM_IS_BRCM_CONTROLLER to end usecase
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

3 years agoRemove unused #defs _DM_LE_KEY_
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

3 years agoRemove unnecessary #def BTA_LE_KEY_
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

3 years agoRemove unnecessary #def BTIF_DM_LE_KEY_ am: 2e8b1e2426
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

3 years agoRemove unused #defs stack/include/sdpdefs:: am: c14df7b3f9
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

3 years agoLog "device" btif/src/btif_config.c::btif_get_device_type am: f4b14ac760
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

3 years agoRemove unused #def BTM_MAX_VENDOR_SPECIFIC_LEN am: 1873a2babd
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

3 years agoSet default tag to 'bluetooth' am: 92b756348f
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

3 years agoReplace #def btif/src/btif_sock_thread::APPL_TRACE_DEBUG am: 976d99b20c
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

3 years agoRemove unused #defs bta/include/bta_api:: am: 2b12241ab3
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

3 years agoRemove unused #defs stack/smp:: am: 8fead02f91
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

3 years agoRemove unnecessary #def BTIF_DM_LE_KEY_
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

3 years agoRemove unused #defs stack/include/sdpdefs::
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

3 years agoLog "device" btif/src/btif_config.c::btif_get_device_type
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

3 years agoRemove unused #def BTM_MAX_VENDOR_SPECIFIC_LEN
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

3 years agoSet default tag to 'bluetooth'
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

3 years agoReplace #def btif/src/btif_sock_thread::APPL_TRACE_DEBUG
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

3 years agoRemove unused #defs bta/include/bta_api::
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

3 years agoRemove unused #defs stack/smp::
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

3 years agoRefactor adding ext prop descriptor am: c0076a0dff
HsingYuan Lo [Thu, 17 Sep 2020 12:24:12 +0000 (12:24 +0000)]
Refactor adding ext prop descriptor am: c0076a0dff

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

Change-Id: Ifba438e317dd59fa2fab4f49d40b927486e88f29

3 years agoRefactor adding ext prop descriptor
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

3 years agoMerge "SDP_SERVER_ENABLED is always true" am: e42ffb89ee
Treehugger Robot [Thu, 17 Sep 2020 00:22:14 +0000 (00:22 +0000)]
Merge "SDP_SERVER_ENABLED is always true" am: e42ffb89ee

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

Change-Id: Ia4bf9a36fe8fcaca22cdd9e2ee73cc7afdd98f07

3 years agoMerge "SDP_SERVER_ENABLED is always true"
Treehugger Robot [Wed, 16 Sep 2020 23:43:59 +0000 (23:43 +0000)]
Merge "SDP_SERVER_ENABLED is always true"

3 years agoMerge "gd: Change AdvertiserId type to uint8_t" am: dfb491f007
Treehugger Robot [Wed, 16 Sep 2020 18:56:54 +0000 (18:56 +0000)]
Merge "gd: Change AdvertiserId type to uint8_t" am: dfb491f007

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

Change-Id: Id936f0b9ce950350e967661627df99f73e2bea45

3 years agoMerge "gd: add shim layer for LE advertising manager" am: da318b067e
Treehugger Robot [Wed, 16 Sep 2020 18:56:44 +0000 (18:56 +0000)]
Merge "gd: add shim layer for LE advertising manager" am: da318b067e

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

Change-Id: Ia70d874085f36b43a9a0a83032c9e34605e772d2

3 years agoMerge "gd: add LE advertising callback" am: 4914ea396b
Treehugger Robot [Wed, 16 Sep 2020 18:55:52 +0000 (18:55 +0000)]
Merge "gd: add LE advertising callback" am: 4914ea396b

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

Change-Id: I5deac074e43b3446c29af33c0a67bcbe0f15ab12

3 years agoMerge "gd: Change AdvertiserId type to uint8_t"
Treehugger Robot [Wed, 16 Sep 2020 18:28:21 +0000 (18:28 +0000)]
Merge "gd: Change AdvertiserId type to uint8_t"

3 years agoMerge "gd: add shim layer for LE advertising manager"
Treehugger Robot [Wed, 16 Sep 2020 18:28:16 +0000 (18:28 +0000)]
Merge "gd: add shim layer for LE advertising manager"

3 years agoMerge "gd: add LE advertising callback"
Treehugger Robot [Wed, 16 Sep 2020 18:27:44 +0000 (18:27 +0000)]
Merge "gd: add LE advertising callback"

3 years agoSDP_SERVER_ENABLED is always true
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

3 years agoFix likely-unhit memory leak am: cc0973a644
Chris Manton [Wed, 16 Sep 2020 17:28:09 +0000 (17:28 +0000)]
Fix likely-unhit memory leak am: cc0973a644

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

Change-Id: Iaf8f1b27944ab5cd9b599cc3696d8f0020653c93

3 years agoRemove #def code conditional BT_MAX_SERVICE_NAME_LEN am: 44f3ee6593
Chris Manton [Wed, 16 Sep 2020 17:28:06 +0000 (17:28 +0000)]
Remove #def code conditional BT_MAX_SERVICE_NAME_LEN am: 44f3ee6593

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

Change-Id: I73ce771fb529a1ee8b5d7f5ba33c6f6fe1b3a6f6

3 years agoReplace #def BTM_SEC_SERVICE_NAME_LEN am: a1e1e5245b
Chris Manton [Wed, 16 Sep 2020 17:28:03 +0000 (17:28 +0000)]
Replace #def BTM_SEC_SERVICE_NAME_LEN am: a1e1e5245b

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

Change-Id: I25c1c67028d294773f5f95bae2ba3619f13ac5bd

3 years agoAdd header declarations am: d3285711d8
Chris Manton [Wed, 16 Sep 2020 17:28:00 +0000 (17:28 +0000)]
Add header declarations am: d3285711d8

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

Change-Id: Ifeda47356d6ab8798f03589300e2ac652a380a44

3 years agoRemove unused def L2CAP_WAKE_PARKED_LINK am: 052141550c
Chris Manton [Wed, 16 Sep 2020 17:27:57 +0000 (17:27 +0000)]
Remove unused def L2CAP_WAKE_PARKED_LINK am: 052141550c

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

Change-Id: Ia3f9c3f25bc2b1ce90b836b425d57653e03b47ca

3 years agoRemove unused return val btif/src::btsock_thread_init am: 26c6ab7173
Chris Manton [Wed, 16 Sep 2020 17:27:25 +0000 (17:27 +0000)]
Remove unused return val btif/src::btsock_thread_init am: 26c6ab7173

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

Change-Id: I2b52d0b805a29b7363dccd76dd802a4ae134f5cf

3 years agogd: Change AdvertiserId type to uint8_t
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

3 years agogd: add shim layer for LE advertising manager
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

3 years agogd: add LE advertising callback
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

3 years agoFix likely-unhit memory leak
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

3 years agoRemove #def code conditional BT_MAX_SERVICE_NAME_LEN
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

3 years agoReplace #def BTM_SEC_SERVICE_NAME_LEN
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

3 years agoAdd header declarations
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

3 years agoRemove unused def L2CAP_WAKE_PARKED_LINK
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

3 years agoRemove unused return val btif/src::btsock_thread_init
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

3 years agoMerge "bnep_disconnect_cfm does nothing" am: e15fdb48ea
Treehugger Robot [Tue, 15 Sep 2020 20:13:19 +0000 (20:13 +0000)]
Merge "bnep_disconnect_cfm does nothing" am: e15fdb48ea

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

Change-Id: I48baa29edffc3cfa72471e6f93718d3635837568

3 years agoMerge "Remove the empty line" am: 1ca46136ea
Treehugger Robot [Tue, 15 Sep 2020 20:12:17 +0000 (20:12 +0000)]
Merge "Remove the empty line" am: 1ca46136ea

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

Change-Id: I4dd771d8b9ed04f49223e0e2e44588f8795031c3