OSDN Git Service

android-x86/system-bt.git
3 years agoGD: Enforce link encryption in L2cap am: ee110cfef1
Hansong Zhang [Thu, 8 Oct 2020 07:01:24 +0000 (07:01 +0000)]
GD: Enforce link encryption in L2cap am: ee110cfef1

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

Change-Id: I65ef8e87906bdf7b4de719815a464d04cdd9cf73

3 years agoGD: Enforce link encryption in L2cap
Hansong Zhang [Thu, 1 Oct 2020 19:09:57 +0000 (12:09 -0700)]
GD: Enforce link encryption in L2cap

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: I2cbeeab04ba23c6575f9042fd2785c2c427ce200

3 years agoMerge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ... am: 2069e3d00d
Treehugger Robot [Thu, 8 Oct 2020 03:16:12 +0000 (03:16 +0000)]
Merge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ... am: 2069e3d00d

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

Change-Id: Ic2157a5036c97323a32e977154f7d819805ac5f4

3 years agoMerge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ...
Treehugger Robot [Thu, 8 Oct 2020 02:53:20 +0000 (02:53 +0000)]
Merge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ...

* changes:
  Re-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete
  Move btm_ble_increment_link_topology_mask l2c=>btm
  Streamline conditional stack/btm/btm_ble::btm_ble_connected
  enum-ify tL2CAP_LE_RESULT_
  Add api around select fields tL2C_CB::tL2C_LCB::
  enum-ify stack/include/l2c_api::L2CAP_PRIORITY_

3 years agoAVRCP: Advance iterator before deleting it am: 6370db8086
Hansong Zhang [Thu, 8 Oct 2020 00:53:14 +0000 (00:53 +0000)]
AVRCP: Advance iterator before deleting it am: 6370db8086

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

Change-Id: I9418060d15bad8a2fb9b78e6581713d67ea0348b

3 years agoAVRCP: Advance iterator before deleting it
Hansong Zhang [Wed, 7 Oct 2020 21:50:15 +0000 (14:50 -0700)]
AVRCP: Advance iterator before deleting it

When we invoke instance_->avrc_->Close(), it will invoke the callback in
AcceptorControlCb by the state machine from AVCT, and the iterator will
be deleted. Now we advanece the iterator first.

Bug: 169747177
Test: Connect to a speaker with AVRCP, and turn off Bluetooth
Tag: #stability
Change-Id: If4ed403d355242da48b7ee49dd74784f43de1b1d

3 years agoMerge "shim/l2cap: Fix RegisterLECoc function" am: 27d85b2dbd
Treehugger Robot [Thu, 8 Oct 2020 00:17:35 +0000 (00:17 +0000)]
Merge "shim/l2cap: Fix RegisterLECoc function" am: 27d85b2dbd

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

Change-Id: I173f7f20a996e9c2d4240cc88640578d763be1b2

3 years agoMerge "shim/l2cap: Fix RegisterLECoc function"
Treehugger Robot [Thu, 8 Oct 2020 00:02:41 +0000 (00:02 +0000)]
Merge "shim/l2cap: Fix RegisterLECoc function"

3 years agoRe-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete
Chris Manton [Tue, 22 Sep 2020 16:08:46 +0000 (09:08 -0700)]
Re-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: Ie0f33c905783981c92b06f5ea5718d49365200af

3 years agoMove btm_ble_increment_link_topology_mask l2c=>btm
Chris Manton [Tue, 22 Sep 2020 02:13:47 +0000 (19:13 -0700)]
Move btm_ble_increment_link_topology_mask l2c=>btm

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I683d68030531bbc635c5f357a8cc356d925d40c8

3 years agoStreamline conditional stack/btm/btm_ble::btm_ble_connected
Chris Manton [Tue, 22 Sep 2020 02:09:34 +0000 (19:09 -0700)]
Streamline conditional stack/btm/btm_ble::btm_ble_connected

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I908ff98f333e173762d25b1e6820db7a433af3af

3 years agoenum-ify tL2CAP_LE_RESULT_
Chris Manton [Mon, 5 Oct 2020 05:44:39 +0000 (22:44 -0700)]
enum-ify tL2CAP_LE_RESULT_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I0a6c26c962277607c5447619d64ce95b47a33311

3 years agoAdd api around select fields tL2C_CB::tL2C_LCB::
Chris Manton [Tue, 6 Oct 2020 17:37:29 +0000 (10:37 -0700)]
Add api around select fields tL2C_CB::tL2C_LCB::

tL2C_CB::tL2C_LCB::link_xmit_quota
tL2C_CB::tL2C_LCB::round_robin_unacked
tL2C_CB::tL2C_LCB::ble_round_robin_unacked
tL2C_CB::tL2C_LCB::acl_priority

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I392dac8bd8fb33cf8350a7fac1d160595c54ed1c

3 years agoenum-ify stack/include/l2c_api::L2CAP_PRIORITY_
Chris Manton [Tue, 6 Oct 2020 17:09:58 +0000 (10:09 -0700)]
enum-ify stack/include/l2c_api::L2CAP_PRIORITY_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I6d0f97493f407f1a4e32bc12434ec5c3c3b8ef54

3 years agoMerge "GD-HCI: Change command and event logs from INFO to DEBUG" am: 9e8e3b84ff
Jack He [Wed, 7 Oct 2020 20:49:12 +0000 (20:49 +0000)]
Merge "GD-HCI: Change command and event logs from INFO to DEBUG" am: 9e8e3b84ff

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

Change-Id: I8f74156d59c6c25c1a15b7bb6089a7433296e00a

3 years agoMerge "GD-HCI: Change StopWatch log from INFO to DEBUG" am: f1ea5e9c9e
Jack He [Wed, 7 Oct 2020 20:48:49 +0000 (20:48 +0000)]
Merge "GD-HCI: Change StopWatch log from INFO to DEBUG" am: f1ea5e9c9e

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

Change-Id: I373e228f14c125ed864a809e0e87b41e92cb48f0

3 years agoMerge "GD-Logging: Add INIT flags to configure debug logging" am: 10a1228882
Jack He [Wed, 7 Oct 2020 20:48:05 +0000 (20:48 +0000)]
Merge "GD-Logging: Add INIT flags to configure debug logging" am: 10a1228882

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

Change-Id: Ie7a1952b5e3d425d6e4a36039dec05464f02f3ba

3 years agoMerge "GD-HCI: Change command and event logs from INFO to DEBUG"
Jack He [Wed, 7 Oct 2020 20:26:59 +0000 (20:26 +0000)]
Merge "GD-HCI: Change command and event logs from INFO to DEBUG"

3 years agoMerge "GD-HCI: Change StopWatch log from INFO to DEBUG"
Jack He [Wed, 7 Oct 2020 20:26:51 +0000 (20:26 +0000)]
Merge "GD-HCI: Change StopWatch log from INFO to DEBUG"

3 years agoMerge "GD-Logging: Add INIT flags to configure debug logging"
Jack He [Wed, 7 Oct 2020 20:25:40 +0000 (20:25 +0000)]
Merge "GD-Logging: Add INIT flags to configure debug logging"

3 years agoshim/l2cap: Fix RegisterLECoc function
Łukasz Rymanowski [Fri, 2 Oct 2020 09:35:38 +0000 (09:35 +0000)]
shim/l2cap: Fix RegisterLECoc function

Change-Id: I6079b1456580f9f49aa18396177e2eef0d9e1398

3 years agoMerge "Implement encryption key size negotiation" am: 0baf4f2baf
Jakub Pawlowski [Wed, 7 Oct 2020 07:56:51 +0000 (07:56 +0000)]
Merge "Implement encryption key size negotiation" am: 0baf4f2baf

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

Change-Id: I4dbfd5159eab0eaee9126a208b77d190dfaabfb3

3 years agoGD: Store peer keys in legacy format am: 7c1847ad0d
Jakub Pawlowski [Wed, 7 Oct 2020 07:44:35 +0000 (07:44 +0000)]
GD: Store peer keys in legacy format am: 7c1847ad0d

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

Change-Id: Ib4c4c14357f1dc6a4f3b2235b7a03946babe91dd

3 years agoMerge "Implement encryption key size negotiation"
Jakub Pawlowski [Wed, 7 Oct 2020 06:16:54 +0000 (06:16 +0000)]
Merge "Implement encryption key size negotiation"

3 years agoGD: Store peer keys in legacy format
Jakub Pawlowski [Thu, 1 Oct 2020 13:12:25 +0000 (15:12 +0200)]
GD: Store peer keys in legacy format

Bug: 142341141
Tag: #gd-refactor
Test: cert/run --host SecurityRecordStorageTest
Change-Id: I94d270da66977fef6356f011b649bb405d0c4324

3 years agoMerge "GD-Logging: Change LOG_DEBUG to LOG_INFO" am: 318e323516
Jack He [Tue, 6 Oct 2020 23:31:45 +0000 (23:31 +0000)]
Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO" am: 318e323516

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

Change-Id: Ic5a9b79fff00f841e4a1ce81074525129340ae5f

3 years agoImplement encryption key size negotiation
Jakub Pawlowski [Mon, 5 Oct 2020 18:29:24 +0000 (20:29 +0200)]
Implement encryption key size negotiation

Bug: 142341141
Tag: #gd-refactor
Test: gd/cert/run --host LeSecurityTest:test_min_encryption_key_size_equal_to_max
Change-Id: I478d29cf20537075ef2a3dc9f707040e0b657ae1

3 years agoMerge "GD-Logging: Change LOG_DEBUG to LOG_INFO"
Jack He [Tue, 6 Oct 2020 22:56:19 +0000 (22:56 +0000)]
Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO"

3 years agoGD-HCI: Change command and event logs from INFO to DEBUG
Jack He [Tue, 6 Oct 2020 22:52:40 +0000 (15:52 -0700)]
GD-HCI: Change command and event logs from INFO to DEBUG

* So that they are not enabled by default

Bug: 164932634
Tag: #gd-refactor
Test: manual testing
Change-Id: I9ff67922b0305cd6397d497dccd038e0444a1d03

3 years agoGD-HCI: Change StopWatch log from INFO to DEBUG
Jack He [Tue, 6 Oct 2020 22:23:28 +0000 (15:23 -0700)]
GD-HCI: Change StopWatch log from INFO to DEBUG

* So that it is disabled by default

Bug: 164973960
Test: manual testing
Tag: #gd-refactor
Change-Id: If65ff532621f53f9ccf554121d702c3c41da5a96

3 years agoMerge "DO NOT MERGE - Merge RP1A.201005.006" am: 822d747312
Xin Li [Tue, 6 Oct 2020 20:24:35 +0000 (20:24 +0000)]
Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 822d747312

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

Change-Id: Ie5a10fc0a5ce58f2ee6494d5d8ee46b8f928873d

3 years agoDO NOT MERGE - Merge RP1A.201005.006 am: 9e1ebdf522
The Android Open Source Project [Tue, 6 Oct 2020 20:23:54 +0000 (20:23 +0000)]
DO NOT MERGE - Merge RP1A.201005.006 am: 9e1ebdf522

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

Change-Id: If1877b2c672daaec5e8b8b5cb191ffd9621d96c0

3 years agoMerge "DO NOT MERGE - Merge RP1A.201005.006"
Xin Li [Tue, 6 Oct 2020 20:17:27 +0000 (20:17 +0000)]
Merge "DO NOT MERGE - Merge RP1A.201005.006"

3 years agoGD-Logging: Add INIT flags to configure debug logging
Jack He [Mon, 5 Oct 2020 23:38:37 +0000 (16:38 -0700)]
GD-Logging: Add INIT flags to configure debug logging

* Three flags:
 - INIT_logging_debug_enabled_for_all
 - INIT_logging_debug_enabled_for_tags
 - INIT_logging_debug_disabled_for_tags
* If a tag is explicitly disabled or enabled, we will follow that
  setting. Otherwise, we check the global enable flag
* This setup allows us to enable/disable individual tags as well as
  enable or disable debug logging for all tags
* This affects only DEBUG and VERBOSE level logs

Bug: 170163727
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Idb99ef1ca0a2d14c73069fcba396ac76a61ee39d

3 years agoGD-Logging: Change LOG_DEBUG to LOG_INFO
Jack He [Tue, 6 Oct 2020 05:50:55 +0000 (22:50 -0700)]
GD-Logging: Change LOG_DEBUG to LOG_INFO

* Given that LOG_DEBUG will be disabled by default,
  changing existing LOG_DEBUG to LOG_INFO so that
  we don't lose these logs

Bug: 170163727
Test: atest bluetooth_test_gd, manual device test
Tag: #gd-refactor
Change-Id: I84db7751d4bbe6d3ea88122b8cdf72bc150fbe7a

3 years agoMerge "bthal: Do not allow to initialize more than once" am: 38f08d2724
Treehugger Robot [Tue, 6 Oct 2020 18:53:54 +0000 (18:53 +0000)]
Merge "bthal: Do not allow to initialize more than once" am: 38f08d2724

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

Change-Id: Ie58c10ceec2164864233b3f0dd22c82b33373a42

3 years agoProperly shim controller flags am: 5a691a0901
Chris Manton [Tue, 6 Oct 2020 18:52:42 +0000 (18:52 +0000)]
Properly shim controller flags am: 5a691a0901

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

Change-Id: I96b11a58c4ded5981fd79158618eae4b75824d13

3 years agoMerge "bthal: Do not allow to initialize more than once"
Treehugger Robot [Tue, 6 Oct 2020 18:27:28 +0000 (18:27 +0000)]
Merge "bthal: Do not allow to initialize more than once"

3 years agoDO NOT MERGE - Merge RP1A.201005.006
The Android Open Source Project [Tue, 6 Oct 2020 04:00:27 +0000 (21:00 -0700)]
DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Merged-In: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Change-Id: I1be981905f9b5c60b9fc0071200116a368996e00

3 years agoRe-log stack/l2cap/l2c_ble::l2cble_conn_comp am: 8bfbb8ba24
Chris Manton [Tue, 6 Oct 2020 09:04:37 +0000 (09:04 +0000)]
Re-log stack/l2cap/l2c_ble::l2cble_conn_comp am: 8bfbb8ba24

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

Change-Id: I7afeba21452f1df39a8a954449a6e57a30cb47db

3 years agoLegacy ACL shim interface am: 035379ba7d
Chris Manton [Tue, 6 Oct 2020 09:04:33 +0000 (09:04 +0000)]
Legacy ACL shim interface am: 035379ba7d

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

Change-Id: Ia74a6217fcd7bcb1ff6bf983bae2d71b354862f3

3 years agoRemove unused #defs stack/include/hcidefs am: 95f188f34a
Chris Manton [Tue, 6 Oct 2020 09:04:29 +0000 (09:04 +0000)]
Remove unused #defs stack/include/hcidefs am: 95f188f34a

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

Change-Id: I7b6b15938feb86e90510997f5fcfd30d4b58ca8e

3 years agoRemove unused #defs stack/include/bt_types am: b96d27a064
Chris Manton [Tue, 6 Oct 2020 09:04:25 +0000 (09:04 +0000)]
Remove unused #defs stack/include/bt_types am: b96d27a064

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

Change-Id: Ic298f9707ecc60794a6345de458d95e5b1be803a

3 years agoRemove unused var tBTM_SEC_DEV_REC::link_key_changed am: 593ddc1451
Chris Manton [Tue, 6 Oct 2020 09:04:21 +0000 (09:04 +0000)]
Remove unused var tBTM_SEC_DEV_REC::link_key_changed am: 593ddc1451

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

Change-Id: I4ff7ad5f1fdfb8a02576f4ccf132d8b5fae6d0fb

3 years agoStreamline stack/l2cap/l2c_ble::l2cble_notify_le_connection am: 9bc4e5285e
Chris Manton [Tue, 6 Oct 2020 09:04:17 +0000 (09:04 +0000)]
Streamline stack/l2cap/l2c_ble::l2cble_notify_le_connection am: 9bc4e5285e

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

Change-Id: Ib576a2c869e8c9f630542167abc78a555a2bf578

3 years agoAdd stack/include/bt_types::AddressTypeText am: 8d20e0414d
Chris Manton [Tue, 6 Oct 2020 09:04:13 +0000 (09:04 +0000)]
Add stack/include/bt_types::AddressTypeText am: 8d20e0414d

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

Change-Id: I7df1998d74f3a96d8e285b9c04fcede36d14ed58

3 years agoRe-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr am: 0b50fcee28
Chris Manton [Tue, 6 Oct 2020 09:04:09 +0000 (09:04 +0000)]
Re-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr am: 0b50fcee28

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

Change-Id: Ibe8289128d4652458b3bb1b28272da51dfe24cc5

3 years agoRe-log stack/acl/btm_acl am: 4ec5ab73b0
Chris Manton [Tue, 6 Oct 2020 09:04:05 +0000 (09:04 +0000)]
Re-log stack/acl/btm_acl am: 4ec5ab73b0

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

Change-Id: Ia70167abb45e2b836aae8fe5b7033312aef3e386

3 years agoReplace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE am: 9ef98020f1
Chris Manton [Tue, 6 Oct 2020 09:04:01 +0000 (09:04 +0000)]
Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE am: 9ef98020f1

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

Change-Id: Id8ee2396961663244c7b1de5ff6f5f5a8536eb3c

3 years agoSimplify StackAclBtmAcl::btm_bda_to_acl am: f52496654c
Chris Manton [Tue, 6 Oct 2020 09:03:58 +0000 (09:03 +0000)]
Simplify StackAclBtmAcl::btm_bda_to_acl am: f52496654c

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

Change-Id: I2faf3cf4bac158baff419262060e9aee98bb6b4c

3 years agoInternally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr am: 95772843cb
Chris Manton [Tue, 6 Oct 2020 09:03:25 +0000 (09:03 +0000)]
Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr am: 95772843cb

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

Change-Id: I4760a7d62ed76c895b14df6b8f5e44739428d02c

3 years agoProperly shim controller flags
Chris Manton [Tue, 6 Oct 2020 00:32:51 +0000 (17:32 -0700)]
Properly shim controller flags

Bug: 166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I7d311bda8d86ca87032d8a45d35ab4d00a5d4038

3 years agoRe-log stack/l2cap/l2c_ble::l2cble_conn_comp
Chris Manton [Mon, 21 Sep 2020 20:57:11 +0000 (13:57 -0700)]
Re-log stack/l2cap/l2c_ble::l2cble_conn_comp

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6dfd621e83868b36fdb1ac16825db8176600adb9

3 years agoLegacy ACL shim interface
Chris Manton [Mon, 5 Oct 2020 17:07:15 +0000 (10:07 -0700)]
Legacy ACL shim interface

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I2aaa3459e9537a896b374aa2a3eac85aaf1ea30c

3 years agoRemove unused #defs stack/include/hcidefs
Chris Manton [Mon, 21 Sep 2020 15:20:28 +0000 (08:20 -0700)]
Remove unused #defs stack/include/hcidefs

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6b657cf604fac0e3fdb4e51b071c02b451f6e95c

3 years agoRemove unused #defs stack/include/bt_types
Chris Manton [Mon, 21 Sep 2020 00:41:54 +0000 (17:41 -0700)]
Remove unused #defs stack/include/bt_types

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Iff89e74e95d78fe5cf053ca20fead3076fd18cdf

3 years agoRemove unused var tBTM_SEC_DEV_REC::link_key_changed
Chris Manton [Sun, 20 Sep 2020 23:30:42 +0000 (16:30 -0700)]
Remove unused var tBTM_SEC_DEV_REC::link_key_changed

set-once-to-default-read-never

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ife93f8028096744171ae79f2d8608c87e352eff0

3 years agoStreamline stack/l2cap/l2c_ble::l2cble_notify_le_connection
Chris Manton [Sat, 3 Oct 2020 16:22:57 +0000 (09:22 -0700)]
Streamline stack/l2cap/l2c_ble::l2cble_notify_le_connection

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I1ffb5df7acd8f616822ec3eeacef7d88d6dbc249

3 years agoAdd stack/include/bt_types::AddressTypeText
Chris Manton [Mon, 21 Sep 2020 21:00:48 +0000 (14:00 -0700)]
Add stack/include/bt_types::AddressTypeText

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I43b7c46837435ea544eb2e8c90ef981a3bdf3e2f

3 years agoRe-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr
Chris Manton [Sun, 4 Oct 2020 22:03:38 +0000 (15:03 -0700)]
Re-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1ba3ec9198e9832e323da0e8b6e604eb8c8c1c81

3 years agoRe-log stack/acl/btm_acl
Chris Manton [Sun, 4 Oct 2020 01:13:17 +0000 (18:13 -0700)]
Re-log stack/acl/btm_acl

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: Iaf187f592f23992451a741e48d6a9f3730de3f56

3 years agoReplace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE
Chris Manton [Thu, 10 Sep 2020 03:32:52 +0000 (20:32 -0700)]
Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE

Towards the shortest path

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I9475559159475f9f9d81a921cf14c2db62be3839

3 years agoSimplify StackAclBtmAcl::btm_bda_to_acl
Chris Manton [Sun, 16 Aug 2020 22:03:26 +0000 (15:03 -0700)]
Simplify StackAclBtmAcl::btm_bda_to_acl

Towards proper interfaces

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I6573f60cbf5e469fe780c6d5a4506c0dcd39f590

3 years agoInternally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr
Chris Manton [Mon, 17 Aug 2020 04:55:20 +0000 (21:55 -0700)]
Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: Id440b966613aaeb4b39ece7d4517a5158e823456

3 years agoMerge "Remove init flags log message, you can check the dumpsys now" am: 30ddaf173d
Treehugger Robot [Tue, 6 Oct 2020 02:57:56 +0000 (02:57 +0000)]
Merge "Remove init flags log message, you can check the dumpsys now" am: 30ddaf173d

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

Change-Id: I1e2e8cf1fb6c20d6e24f6cab2d3d27e4fbf0cff3

3 years agoMerge "Remove init flags log message, you can check the dumpsys now"
Treehugger Robot [Tue, 6 Oct 2020 02:31:40 +0000 (02:31 +0000)]
Merge "Remove init flags log message, you can check the dumpsys now"

3 years agoMerge "Add A2DP/SDP fuzzers for bt-stack" am: 925f1f4d8f
Treehugger Robot [Tue, 6 Oct 2020 01:16:20 +0000 (01:16 +0000)]
Merge "Add A2DP/SDP fuzzers for bt-stack" am: 925f1f4d8f

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

Change-Id: Id3eddc0b0d7fe1dc4977fea3dd4926f524cec74f

3 years agoMerge "Add A2DP/SDP fuzzers for bt-stack"
Treehugger Robot [Tue, 6 Oct 2020 00:58:46 +0000 (00:58 +0000)]
Merge "Add A2DP/SDP fuzzers for bt-stack"

3 years agoenum-ify tgatt_status am: 80b80d3ec8
Chris Manton [Mon, 5 Oct 2020 20:53:31 +0000 (20:53 +0000)]
enum-ify tgatt_status am: 80b80d3ec8

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

Change-Id: I967861e2eecdd4f7ee532b65d66e6986a92318c2

3 years agoInclude security_device_record stack/acl/btm_acl am: 483c5d9a21
Chris Manton [Mon, 5 Oct 2020 18:20:33 +0000 (18:20 +0000)]
Include security_device_record stack/acl/btm_acl am: 483c5d9a21

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

Change-Id: I51cfa6a5703bee6f5db3ad2eb2c417d3ab2f8715

3 years agoRemove unused defs BTM_ACL_PKT_TYPES_MASK_ am: e937ff70f0
Chris Manton [Mon, 5 Oct 2020 18:19:58 +0000 (18:19 +0000)]
Remove unused defs BTM_ACL_PKT_TYPES_MASK_ am: e937ff70f0

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

Change-Id: Ie046295b529c989f9ffbe4d4b8abd662ec84b3b3

3 years agoenum-ify tgatt_status
Chris Manton [Sun, 4 Oct 2020 17:09:34 +0000 (10:09 -0700)]
enum-ify tgatt_status

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I44a41dfbf11c1bbca77c8f568ed1ada236476d6f

3 years agoInclude security_device_record stack/acl/btm_acl
Chris Manton [Mon, 17 Aug 2020 15:01:56 +0000 (08:01 -0700)]
Include security_device_record stack/acl/btm_acl

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I3b2ed7bd82dff9b504223aa9ea93a72a1c0575b7

3 years agoRemove unused defs BTM_ACL_PKT_TYPES_MASK_
Chris Manton [Sun, 16 Aug 2020 18:21:05 +0000 (11:21 -0700)]
Remove unused defs BTM_ACL_PKT_TYPES_MASK_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I59f2004e5450834dcdc725f52942923aa5294fe4

3 years agolog tgatt status properly am: d5e1f52c7a
Chris Manton [Mon, 5 Oct 2020 08:38:39 +0000 (08:38 +0000)]
log tgatt status properly am: d5e1f52c7a

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

Change-Id: If02db583f1e7eac5e462a35403f2dcb6d3baeb0f

3 years agoencapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC am: 52ac9da327
Chris Manton [Mon, 5 Oct 2020 08:32:37 +0000 (08:32 +0000)]
encapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC am: 52ac9da327

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

Change-Id: I54207f965ae34176312cc0bf10f581c1f9e54a32

3 years agoProperly add typedef for gatt status am: 0fb7cc4885
Chris Manton [Mon, 5 Oct 2020 08:31:59 +0000 (08:31 +0000)]
Properly add typedef for gatt status am: 0fb7cc4885

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

Change-Id: Iaebf9ecfbcd5eb72c58ff5059b503ee32174ac5f

3 years agolog tgatt status properly
Chris Manton [Sun, 4 Oct 2020 06:47:35 +0000 (23:47 -0700)]
log tgatt status properly

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I5e4c526baca73a3c4e5e64a4b4bea4daab31116a

3 years agoencapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC
Chris Manton [Mon, 7 Sep 2020 19:51:18 +0000 (12:51 -0700)]
encapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ia5e04ba5c05783ee6b7458989f1898c50db80584

3 years agoProperly add typedef for gatt status
Chris Manton [Sun, 4 Oct 2020 06:46:48 +0000 (23:46 -0700)]
Properly add typedef for gatt status

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I058946087572442b26a42e36076db273076c7518

3 years agoMerge "GD Security: Fix bad conditional" am: 23bc14bf07
Treehugger Robot [Sun, 4 Oct 2020 00:01:01 +0000 (00:01 +0000)]
Merge "GD Security: Fix bad conditional" am: 23bc14bf07

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

Change-Id: Ia4172485560ae29acde720f8e315ed41a362aadd

3 years agoMerge "GD Security: Fix bad conditional"
Treehugger Robot [Sat, 3 Oct 2020 23:57:33 +0000 (23:57 +0000)]
Merge "GD Security: Fix bad conditional"

3 years agoAdd include stack/smp/smp_act::smp_api_types.h am: a5d60f57d9
Chris Manton [Sat, 3 Oct 2020 23:44:33 +0000 (23:44 +0000)]
Add include stack/smp/smp_act::smp_api_types.h am: a5d60f57d9

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

Change-Id: I3ec6758f631ca8586b0896118100190470264369

3 years agoEncapulate tBTM_SEC_DEV_REC::pin_code_length am: c0358734f2
Chris Manton [Sat, 3 Oct 2020 23:44:19 +0000 (23:44 +0000)]
Encapulate tBTM_SEC_DEV_REC::pin_code_length am: c0358734f2

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

Change-Id: Ib1160bd01dc559b829b62f2823d639b184fcc580

3 years agoWrap API around tBTM_SEC_DEV_REC::BTM_SEC_ am: 99d84b1f8b
Chris Manton [Sat, 3 Oct 2020 23:44:16 +0000 (23:44 +0000)]
Wrap API around tBTM_SEC_DEV_REC::BTM_SEC_ am: 99d84b1f8b

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

Change-Id: I0ecfce444a8d0738fde2ff9177348aa81dbffa02

3 years agoRe-log btif/src/btif_sdp_server:: am: 2d423fbf1d
Chris Manton [Sat, 3 Oct 2020 23:44:13 +0000 (23:44 +0000)]
Re-log btif/src/btif_sdp_server:: am: 2d423fbf1d

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

Change-Id: I02a280c1869ad6e0c109dbe272471f9591992242

3 years agoRemove unused decls stack/btm/btm_int am: ef095485d2
Chris Manton [Sat, 3 Oct 2020 23:44:10 +0000 (23:44 +0000)]
Remove unused decls stack/btm/btm_int am: ef095485d2

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

Change-Id: I9290826abfe601ad31ea35125a0d11eb48d50c27

3 years agoenum-ify BTM_SEC_ and BTM_SEC_LE am: 6a231f9b75
Chris Manton [Sat, 3 Oct 2020 23:44:07 +0000 (23:44 +0000)]
enum-ify BTM_SEC_ and BTM_SEC_LE am: 6a231f9b75

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

Change-Id: I4218c4dc168fb954f2e41a76243f12470cc9680b

3 years agoRemove unused var tBTM_CB::state_temp_buffer am: ea115fe4f9
Chris Manton [Sat, 3 Oct 2020 23:44:04 +0000 (23:44 +0000)]
Remove unused var tBTM_CB::state_temp_buffer am: ea115fe4f9

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

Change-Id: If0893c1acdc32b705f1079baabe3df8846e62fb7

3 years agoEncapsulate tBTM_CB::btm_scn am: d6e3ce8d7b
Chris Manton [Sat, 3 Oct 2020 23:44:01 +0000 (23:44 +0000)]
Encapsulate tBTM_CB::btm_scn am: d6e3ce8d7b

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

Change-Id: I8ab322ab8de370a948d02c013f7ed653a9da75b1

3 years agoEncapsulate tBTM_CB::enc_rand, ediv, key_size am: 829451f652
Chris Manton [Sat, 3 Oct 2020 23:43:58 +0000 (23:43 +0000)]
Encapsulate tBTM_CB::enc_rand, ediv, key_size am: 829451f652

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

Change-Id: I9dfdee968a86275055b72df5080e69859bc977e2

3 years agoEncapsulate tBTM_CB::enc_handle am: ddf998bdd8
Chris Manton [Sat, 3 Oct 2020 23:43:54 +0000 (23:43 +0000)]
Encapsulate tBTM_CB::enc_handle am: ddf998bdd8

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

Change-Id: I33c4b30837443b28da57fd176c3bb6bac5a7a917

3 years agoL2CA_SetFlushTimeout does nothing. am: 928e707151
Chris Manton [Sat, 3 Oct 2020 23:43:51 +0000 (23:43 +0000)]
L2CA_SetFlushTimeout does nothing. am: 928e707151

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

Change-Id: I94343d6e59b0f43f2ae2ad816c2ac5635fb8bb5b

3 years agoRe-align read remote version information on legacy am: 2c0a6c7825
Chris Manton [Sat, 3 Oct 2020 23:43:11 +0000 (23:43 +0000)]
Re-align read remote version information on legacy am: 2c0a6c7825

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

Change-Id: Id708d38839dbf2d8e7187f24930aefc2bd4f6acb

3 years agoGD Security: Fix bad conditional
Martin Brabham [Fri, 2 Oct 2020 19:03:34 +0000 (12:03 -0700)]
GD Security: Fix bad conditional

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I87bb3ac3ae7ccfc8164cf8565eb1e88f2f44e2d6

3 years agoAdd include stack/smp/smp_act::smp_api_types.h
Chris Manton [Sun, 13 Sep 2020 22:39:15 +0000 (15:39 -0700)]
Add include stack/smp/smp_act::smp_api_types.h

Include what you use

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1de6caf318d75776ac2dbc5456ea32e287622d39

3 years agoEncapulate tBTM_SEC_DEV_REC::pin_code_length
Chris Manton [Sun, 20 Sep 2020 23:25:17 +0000 (16:25 -0700)]
Encapulate tBTM_SEC_DEV_REC::pin_code_length

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ic48c5e60495b4308bf6c7b26e9de18745453bed8

3 years agoWrap API around tBTM_SEC_DEV_REC::BTM_SEC_
Chris Manton [Sun, 20 Sep 2020 20:45:43 +0000 (13:45 -0700)]
Wrap API around tBTM_SEC_DEV_REC::BTM_SEC_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I3e337b78e2ba7ed2eb2cf328d6b03c43a998fef4

3 years agoRe-log btif/src/btif_sdp_server::
Chris Manton [Thu, 24 Sep 2020 18:15:58 +0000 (11:15 -0700)]
Re-log btif/src/btif_sdp_server::

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ia57c281cc844a4c254c53324a4c4bd1eaf7af1c3

3 years agoRemove unused decls stack/btm/btm_int
Chris Manton [Sun, 20 Sep 2020 22:20:48 +0000 (15:20 -0700)]
Remove unused decls stack/btm/btm_int

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: If3c47ffa09fa458a381a381cddc6f37a9835f7a4