OSDN Git Service

android-x86/system-bt.git
3 years agoMerge "GD-HCI: Change command and event logs from INFO to DEBUG" am: 9e8e3b84ff am...
Jack He [Wed, 7 Oct 2020 21:19:14 +0000 (21:19 +0000)]
Merge "GD-HCI: Change command and event logs from INFO to DEBUG" am: 9e8e3b84ff am: 8fd69eb58b

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

Change-Id: I10a3548277dd9969ab7fe12560284ce3cbfafa51

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

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

Change-Id: I7d026884e221adc3b9985e3802febb6129c9bff5

3 years agoMerge "GD-Logging: Add INIT flags to configure debug logging" am: 10a1228882 am:...
Jack He [Wed, 7 Oct 2020 21:18:31 +0000 (21:18 +0000)]
Merge "GD-Logging: Add INIT flags to configure debug logging" am: 10a1228882 am: 28ae01823d

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

Change-Id: I8e65a4dcd4eb7d71052d958921078c0078fb8463

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 agoMerge "Implement encryption key size negotiation" am: 0baf4f2baf am: a479ac1efb
Jakub Pawlowski [Wed, 7 Oct 2020 07:58:39 +0000 (07:58 +0000)]
Merge "Implement encryption key size negotiation" am: 0baf4f2baf am: a479ac1efb

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

Change-Id: I46fc66d9935247ba3bd05777b7f0b131d4e19502

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

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

Change-Id: I6a6c76aaf94a3087c8cfb64bfd6b2f3e98332554

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 am: 2b733dc214
Jack He [Wed, 7 Oct 2020 00:00:43 +0000 (00:00 +0000)]
Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO" am: 318e323516 am: 2b733dc214

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

Change-Id: Id0881eff74d6c0c7ce8650f323ba54c3621a9b5a

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 23:37:27 +0000 (23:37 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317 am: fa1724a501 am: 502d60e1e4 am: 75f78efd2f am: f07b30362d

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

Change-Id: I4e82280def9bc7ad953ba8b727d29e62c809e279

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 agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 23:20:11 +0000 (23:20 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317 am: fa1724a501 am: 502d60e1e4 am: 75f78efd2f

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

Change-Id: Ie5f92538d13e353f7bdd68490e4f52c3d8274d9c

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 agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 22:13:45 +0000 (22:13 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317 am: fa1724a501 am: 502d60e1e4

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

Change-Id: I1ed229afa0015de7ac4af6d417ec64fc1a74121e

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 21:45:27 +0000 (21:45 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317 am: fa1724a501

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

Change-Id: I6ccef29a5b8bbe61ad33317c1ff0add3e8f7927e

3 years ago[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 822d747312...
Xin Li [Tue, 6 Oct 2020 21:15:47 +0000 (21:15 +0000)]
[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 822d747312 am: 064f2cd106 -s ours

am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1 342cb328b6 is in history

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

Change-Id: Ic74e7f30ed12c2f8e22338321832c9a14ec0dd47

3 years ago[automerger skipped] DO NOT MERGE - Merge RP1A.201005.006 am: 9e1ebdf522 am: bca07e22...
The Android Open Source Project [Tue, 6 Oct 2020 21:15:42 +0000 (21:15 +0000)]
[automerger skipped] DO NOT MERGE - Merge RP1A.201005.006 am: 9e1ebdf522 am: bca07e22d0 -s ours

am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1 342cb328b6 is in history

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

Change-Id: I63ddd1b3c81da071128e2db5ee4252d9817e9c1a

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 20:53:43 +0000 (20:53 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9 am: 7337996317

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

Change-Id: Iaa69ebded8be2055cb9fee48d2d0b2e3ec8365cf

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 agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0a...
Chen Chen [Tue, 6 Oct 2020 20:16:04 +0000 (20:16 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87 am: 98e0ae0ef9

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

Change-Id: I7d010b57ab226b166d9895d95101056b2f305d31

3 years agoMerge "bthal: Do not allow to initialize more than once" am: 38f08d2724 am: 7623685f83
Treehugger Robot [Tue, 6 Oct 2020 19:57:29 +0000 (19:57 +0000)]
Merge "bthal: Do not allow to initialize more than once" am: 38f08d2724 am: 7623685f83

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

Change-Id: I869b614734f1bf6d1218c48562cc38832cd76088

3 years agoCheck Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87
Chen Chen [Tue, 6 Oct 2020 19:57:19 +0000 (19:57 +0000)]
Check Classic key before cross-key derivation am: 814160abca am: 6cddc6cd87

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

Change-Id: I1391cb656ed035aaec7beb0f2c11e5b3c008f4cc

3 years agoProperly shim controller flags am: 5a691a0901 am: 9b94d537b3
Chris Manton [Tue, 6 Oct 2020 19:57:19 +0000 (19:57 +0000)]
Properly shim controller flags am: 5a691a0901 am: 9b94d537b3

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

Change-Id: I0aa15516b04270a245ab066d8b98d367b498cc01

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 agoCheck Classic key before cross-key derivation am: 814160abca
Chen Chen [Tue, 6 Oct 2020 18:52:36 +0000 (18:52 +0000)]
Check Classic key before cross-key derivation am: 814160abca

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

Change-Id: I10b980c9f480dd9e2f2adb5af47cb23ff99421e6

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 agoCheck Classic key before cross-key derivation
Chen Chen [Thu, 24 Sep 2020 00:02:58 +0000 (17:02 -0700)]
Check Classic key before cross-key derivation

Bug: 158854097
Test: atest net_test_stack_smp
Tag: #security
Ignore-AOSP-First: Security fix
Exempt-From-Owner-Approval: Already got owner approval,
but somehow it still shows no owner vote

Change-Id: Id88241324e9fb89ef14e50b52eb459a0d81c492b

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 agoMerge "Check Classic key before cross-key derivation" into qt-qpr1-dev am: 285caebef7...
TreeHugger Robot [Tue, 6 Oct 2020 10:11:36 +0000 (10:11 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am: 285caebef7 am: ace3e37d8c am: 1ef4307051

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

Change-Id: I74cdba16343747c9dacf22d29d38233478db9890

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

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

Change-Id: I22ca5b84ca1abbbe7f452fdb0af656ab850ff89e

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

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

Change-Id: I2e15a3779df045d8f1ed667213bd8a9b618bfa12

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

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

Change-Id: Id8093328dae6121e5b5c862a3029c177cfabee97

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

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

Change-Id: I564ad3d456e12138aa6bf1168eceaae059b0175c

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

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

Change-Id: I9f3434676f35963cb98601d92d2cdd21a4514bb2

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

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

Change-Id: If041b5cfa862e2b317dff7a37463fdd0d8f97164

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

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

Change-Id: I5da27bbb965bf3923f9746d72661a8021d558257

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

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

Change-Id: I666630de7379a2c5639fc3b1817662430d732446

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

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

Change-Id: I2ac11d38ff7d13838e5d4805393247e8b638ecd5

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

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

Change-Id: Ic1c15ff98813ffc60d8115c1f707c11eb74fb91d

3 years agoSimplify StackAclBtmAcl::btm_bda_to_acl am: f52496654c am: 0600c53de3
Chris Manton [Tue, 6 Oct 2020 09:40:36 +0000 (09:40 +0000)]
Simplify StackAclBtmAcl::btm_bda_to_acl am: f52496654c am: 0600c53de3

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

Change-Id: I2cec0f0a477f64f52df99e3cb8015b1ec886de33

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

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

Change-Id: Icb5e6edb270e391738db278375ea8fa579d6ff89

3 years agoMerge "Check Classic key before cross-key derivation" into qt-qpr1-dev am: 285caebef7...
TreeHugger Robot [Tue, 6 Oct 2020 09:34:16 +0000 (09:34 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am: 285caebef7 am: ace3e37d8c

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

Change-Id: I431f6ba0eceff663fd358b8281ed462f4d0b0730

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 agoMerge "Check Classic key before cross-key derivation" into qt-qpr1-dev am: 285caebef7
TreeHugger Robot [Tue, 6 Oct 2020 08:51:28 +0000 (08:51 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev am: 285caebef7

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

Change-Id: If5f3d6fc4f8b7f93144459e45ca8588cf47cf1fa

3 years agoMerge "Check Classic key before cross-key derivation" into qt-qpr1-dev
TreeHugger Robot [Tue, 6 Oct 2020 08:34:08 +0000 (08:34 +0000)]
Merge "Check Classic key before cross-key derivation" into qt-qpr1-dev

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 agoCheck Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896 am: 212d7...
Chen Chen [Tue, 6 Oct 2020 05:35:00 +0000 (05:35 +0000)]
Check Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896 am: 212d730545 am: 6884783558 am: b5b63154d7 am: bf000ad36f

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

Change-Id: Ie470345982e97a73679109a0cb24d8a4e8c55128

3 years agoCheck Classic key before cross-key derivation am: da8aa68903 am: 85a7c65c28 am: 9407e...
Chen Chen [Tue, 6 Oct 2020 05:34:54 +0000 (05:34 +0000)]
Check Classic key before cross-key derivation am: da8aa68903 am: 85a7c65c28 am: 9407e4f700 am: 1db44e4aeb am: 9064df5235

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

Change-Id: I159b9679713ffce2d6ec010284af230e3739e07d

3 years agoCheck Classic key before cross-key derivation am: d3521aa04a am: 364407c8d2 am: aad20...
Chen Chen [Tue, 6 Oct 2020 05:34:48 +0000 (05:34 +0000)]
Check Classic key before cross-key derivation am: d3521aa04a am: 364407c8d2 am: aad205be66 am: b9cab6c940

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

Change-Id: I451786aa4ed0616619a5d338211613c038c0f776

3 years agoCheck Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896 am: 212d7...
Chen Chen [Tue, 6 Oct 2020 05:13:29 +0000 (05:13 +0000)]
Check Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896 am: 212d730545 am: 6884783558 am: b5b63154d7

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

Change-Id: I955b3e20f0675a18603f1888bf8775c91fc386f1

3 years agoCheck Classic key before cross-key derivation am: da8aa68903 am: 85a7c65c28 am: 9407e...
Chen Chen [Tue, 6 Oct 2020 05:13:20 +0000 (05:13 +0000)]
Check Classic key before cross-key derivation am: da8aa68903 am: 85a7c65c28 am: 9407e4f700 am: 1db44e4aeb

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

Change-Id: I50dced972c7ac60abfe0fa3bd02e20d6fcca5cb2

3 years agoCheck Classic key before cross-key derivation am: d3521aa04a am: 364407c8d2 am: aad20...
Chen Chen [Tue, 6 Oct 2020 05:13:12 +0000 (05:13 +0000)]
Check Classic key before cross-key derivation am: d3521aa04a am: 364407c8d2 am: aad205be66

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

Change-Id: I2f9b0409b41e9cee0151e290b443ade2a7d6aaac

3 years agoCheck Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896 am: 212d7...
Chen Chen [Tue, 6 Oct 2020 04:38:13 +0000 (04:38 +0000)]
Check Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896 am: 212d730545 am: 6884783558

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

Change-Id: Ic22e35a189b734585ab561aeb0ce8d263297ba42

3 years agoCheck Classic key before cross-key derivation am: da8aa68903 am: 85a7c65c28 am: 9407e...
Chen Chen [Tue, 6 Oct 2020 04:38:04 +0000 (04:38 +0000)]
Check Classic key before cross-key derivation am: da8aa68903 am: 85a7c65c28 am: 9407e4f700

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

Change-Id: Id279e08fa997f4c7eb748c2aeaf410f31e8860c5

3 years agoCheck Classic key before cross-key derivation am: d3521aa04a am: 364407c8d2
Chen Chen [Tue, 6 Oct 2020 04:37:51 +0000 (04:37 +0000)]
Check Classic key before cross-key derivation am: d3521aa04a am: 364407c8d2

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

Change-Id: I3df576be2b48b49834814309fa495ec6a975f460

3 years agoCheck Classic key before cross-key derivation am: 16146379ad am: d82141f378
Chen Chen [Tue, 6 Oct 2020 04:32:42 +0000 (04:32 +0000)]
Check Classic key before cross-key derivation am: 16146379ad am: d82141f378

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

Change-Id: I8922440190e1986809951b6e4dcf0e393b59776c

3 years agoCheck Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896 am: 212d7...
Chen Chen [Tue, 6 Oct 2020 04:20:30 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896 am: 212d730545

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

Change-Id: Ia482be10c8ac7372a4d36c557e740a83231b10ae

3 years agoCheck Classic key before cross-key derivation am: da8aa68903 am: 85a7c65c28
Chen Chen [Tue, 6 Oct 2020 04:20:24 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am: da8aa68903 am: 85a7c65c28

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

Change-Id: I494f299169e329ece034da105c83e392a13dc875

3 years agoCheck Classic key before cross-key derivation am: d3521aa04a
Chen Chen [Tue, 6 Oct 2020 04:20:18 +0000 (04:20 +0000)]
Check Classic key before cross-key derivation am: d3521aa04a

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

Change-Id: I93f154a331ecfdee704321bd3e94758c18005658

3 years agoCheck Classic key before cross-key derivation am: 16146379ad
Chen Chen [Tue, 6 Oct 2020 04:15:32 +0000 (04:15 +0000)]
Check Classic key before cross-key derivation am: 16146379ad

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

Change-Id: I5886396032be21a2e2230d2bbeb285c57fe1c68b

3 years agoCheck Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896
Chen Chen [Tue, 6 Oct 2020 03:59:41 +0000 (03:59 +0000)]
Check Classic key before cross-key derivation am: 992e25e6b9 am: eec1a1e896

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

Change-Id: Icfc2e05b44e48cc1ee6dd4594877a85195ea15f0

3 years agoCheck Classic key before cross-key derivation am: da8aa68903
Chen Chen [Tue, 6 Oct 2020 03:59:33 +0000 (03:59 +0000)]
Check Classic key before cross-key derivation am: da8aa68903

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

Change-Id: I85a19b10f4f7ac9ec94811d022ed28b2e9a2b848