OSDN Git Service
Chris Manton [Thu, 22 Oct 2020 22:51:09 +0000 (22:51 +0000)]
Use stack/acl/btm_acl::acl_process_extended_features am:
9d80c3fa74
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1469778
Change-Id: Ia2e01820ae1be0ede09c3cda579d6179c534bd02
Chris Manton [Thu, 22 Oct 2020 22:51:05 +0000 (22:51 +0000)]
Add stack/acl/btm_acl::acl_process_extended_features am:
ee487ce726
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1469777
Change-Id: Ie017bda4820042152b7dba13b127032232dc7c77
Chris Manton [Thu, 22 Oct 2020 22:51:01 +0000 (22:51 +0000)]
Add main/shim/acl_legacy_interface::btm_acl_role_changed am:
77a9259dbb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1469776
Change-Id: Ife29ea667cdcac1bf60d4b159b65876e9c217587
Chris Manton [Thu, 22 Oct 2020 22:50:57 +0000 (22:50 +0000)]
Add tHCI_STATUS to btm_acl_role_changed am:
1c9237a289
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1469780
Change-Id: Ifad9f10ca3ff62a5a08b0b90499b44a074a6802d
Chris Manton [Thu, 22 Oct 2020 22:50:53 +0000 (22:50 +0000)]
Should not send classic commands on le link am:
25b8b04caa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1469775
Change-Id: I285ef816b8abace08dae2f59fc6b92a3d0255ec6
Chris Manton [Thu, 22 Oct 2020 22:50:07 +0000 (22:50 +0000)]
Return after gd acl creates connection am:
175ea68186
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1469774
Change-Id: I06d98ef95e339d983b35350e483e555550ab3153
Hansong Zhang [Thu, 22 Oct 2020 21:29:29 +0000 (21:29 +0000)]
L2cap API: Use GD L2cap flag am:
43a4028ecb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466518
Change-Id: I036c088835c279d6054bae09f7ea54e7f1802a48
Hansong Zhang [Thu, 22 Oct 2020 20:47:50 +0000 (20:47 +0000)]
BTM_ACL: Remove unused code am:
85a4ce1ebd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1470505
Change-Id: Ie5aecd881f87bc5ae2efd7ba03d0678014a29a5a
Chris Manton [Thu, 22 Oct 2020 17:35:56 +0000 (10:35 -0700)]
Use stack/acl/btm_acl::acl_process_extended_features
Bug:
166280067
Tag: #refactor
Test: Pair classic device
Change-Id: I1a87ea23c8b4590a313652dca78b0e51354ecb33
Chris Manton [Thu, 22 Oct 2020 17:35:39 +0000 (10:35 -0700)]
Add stack/acl/btm_acl::acl_process_extended_features
Bug:
166280067
Tag: #refactor
Test: Pair classic device
Change-Id: I1136fae14a3673f6dc76b8d3d08414525690f8b3
Chris Manton [Thu, 22 Oct 2020 17:32:05 +0000 (10:32 -0700)]
Add main/shim/acl_legacy_interface::btm_acl_role_changed
Bug:
166280067
Tag: #refactor
Test: Pair classic device
Change-Id: Ie4f2c31ed449a5bf9353efb3ab640cbbbfab211f
Chris Manton [Thu, 22 Oct 2020 19:55:44 +0000 (12:55 -0700)]
Add tHCI_STATUS to btm_acl_role_changed
Bug:
166280067
Tag: #refactor
Test: Pair classic device
Change-Id: I5ba4b72585e9cd9e0e0e45935f6e4a328fc28581
Chris Manton [Tue, 20 Oct 2020 23:57:27 +0000 (16:57 -0700)]
Should not send classic commands on le link
Bug:
171491610
Tag: #refactor
Test: verified on wireshark
Change-Id: I1428ea803a6dd327a81209a4f710d96a8d6612be
Chris Manton [Thu, 22 Oct 2020 17:47:09 +0000 (10:47 -0700)]
Return after gd acl creates connection
Bug:
166280067
Tag: #refactor
Test: Pair classic device
Change-Id: Ie18dc8ba759b6fd20b7cd041a86c86b94c7e9e1f
Hansong Zhang [Thu, 22 Oct 2020 06:56:28 +0000 (06:56 +0000)]
btm_acl_encrypt_change: Use handle directly am:
e61cae84a1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1469800
Change-Id: I8a3a6d4c31615792fc9c91e03f332a4edd4ee10a
Hansong Zhang [Thu, 22 Oct 2020 06:56:24 +0000 (06:56 +0000)]
Flatten btm_sec_start_encryption am:
2da963b73e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1469426
Change-Id: I460c4318572d27f5a504064ac8d9da632ab8e961
Treehugger Robot [Thu, 22 Oct 2020 06:52:20 +0000 (06:52 +0000)]
Merge changes Ie1b2f0f6,I5f115595,I7c766087,If341f69a,Idba0190c, ... am:
8b39458f97
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1469792
Change-Id: I566ef8d048349e2bc0a7a4e8a87aa3577c1d80e7
Hansong Zhang [Mon, 19 Oct 2020 22:47:35 +0000 (15:47 -0700)]
L2cap API: Use GD L2cap flag
Bug:
141555841
Test: cert/run --host
Tag: #gd-refactor
Change-Id: I2c6a67e3f74616d7bd2845049af4273088648de4
Hansong Zhang [Thu, 22 Oct 2020 06:16:52 +0000 (23:16 -0700)]
BTM_ACL: Remove unused code
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1ddd384d8527313ac447c3d2b794a24f461117e9
Hansong Zhang [Wed, 21 Oct 2020 23:18:52 +0000 (16:18 -0700)]
btm_acl_encrypt_change: Use handle directly
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7cc183ca8094315e00e3e924a77f0fec8d47c941
Hansong Zhang [Wed, 21 Oct 2020 22:03:32 +0000 (15:03 -0700)]
Flatten btm_sec_start_encryption
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie0c0709ef3f625657704cc41f40377a60d8c3523
Treehugger Robot [Wed, 21 Oct 2020 23:27:25 +0000 (23:27 +0000)]
Merge changes Ie1b2f0f6,I5f115595,I7c766087,If341f69a,Idba0190c, ...
* changes:
Use acl_create_le_connection_with_id
Add acl_create_le_connection_with_id
Plumb through acl_create|cancel_le_connection
Add bd_features_text
Remove def stack/hcic/hcicmds::BT_10A
Proper interface around disconnect_reason
Use tHCI_STATUS in btm_sec_disconnect
Allow gd acl to take DISCONNECT when enabled
Connect main/shim/acl_legacy_interface::acl_ble_enhanced_connection_complete_from_shim
Add stack/acl/btm_acl::btm_acl_disconnected
Hansong Zhang [Wed, 21 Oct 2020 19:11:02 +0000 (19:11 +0000)]
Refactor btm_sec_set_peer_sec_caps am:
e0ccee6ba5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1467846
Change-Id: I820667b46a0b6fd4435531e13fcf4e10c3ebe81a
Hansong Zhang [Wed, 21 Oct 2020 01:48:52 +0000 (18:48 -0700)]
Refactor btm_sec_set_peer_sec_caps
No need to pass acl_cb
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7cb1bae627c731106ab3a93442acb8f6bb2018fa
Chris Manton [Wed, 21 Oct 2020 16:54:52 +0000 (16:54 +0000)]
Remove unused def BTM_MAX_PRE_SM4_LKEY_TYPE am:
f41cc0b1dd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1467022
Change-Id: I5201f85d5c8b3a0674c8781fda6437f10b2a22ae
Chris Manton [Tue, 20 Oct 2020 21:42:47 +0000 (14:42 -0700)]
Use acl_create_le_connection_with_id
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ie1b2f0f60367ad15834b28ee896989674c6f3614
Chris Manton [Tue, 20 Oct 2020 21:42:21 +0000 (14:42 -0700)]
Add acl_create_le_connection_with_id
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I5f1155951394c3fc073a2b5ef2f57f9e2db2cab4
Chris Manton [Tue, 20 Oct 2020 19:33:54 +0000 (12:33 -0700)]
Plumb through acl_create|cancel_le_connection
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I7c766087716777c274866bff20c197ea41fc80f8
Chris Manton [Sat, 17 Oct 2020 23:11:11 +0000 (16:11 -0700)]
Add bd_features_text
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: If341f69a65b484d88275d95a60cfd15ab64ede5e
Chris Manton [Sun, 11 Oct 2020 15:53:41 +0000 (08:53 -0700)]
Remove def stack/hcic/hcicmds::BT_10A
Always false; untested when true
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Idba0190c8f5f8bb2eab6c93d4f4e9687fc58874b
Chris Manton [Sat, 10 Oct 2020 23:37:11 +0000 (16:37 -0700)]
Proper interface around disconnect_reason
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I10d4bc9ae642c16cf5622adf541db999f442a48f
Chris Manton [Thu, 15 Oct 2020 21:22:32 +0000 (14:22 -0700)]
Use tHCI_STATUS in btm_sec_disconnect
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Idc93062d96aa45c0e4ed385a3fa09e6cbdabf915
Chris Manton [Tue, 20 Oct 2020 16:40:18 +0000 (09:40 -0700)]
Allow gd acl to take DISCONNECT when enabled
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ib460b3c9c63572753d51aaf1c49f56024b6d4bfb
Chris Manton [Tue, 20 Oct 2020 16:36:07 +0000 (09:36 -0700)]
Connect main/shim/acl_legacy_interface::acl_ble_enhanced_connection_complete_from_shim
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I26ae8837788425a74d7202a40b3e7fc7b2c7a279
Chris Manton [Fri, 16 Oct 2020 15:54:53 +0000 (08:54 -0700)]
Add stack/acl/btm_acl::btm_acl_disconnected
Also connect to shim acl
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I8a3d7ef1f44b637a053e85a98765a3db5498e590
Chris Manton [Sat, 17 Oct 2020 22:54:42 +0000 (15:54 -0700)]
Remove unused def BTM_MAX_PRE_SM4_LKEY_TYPE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: Compiled and passed basic functionality
Change-Id: Icba095ec66c4d9b65cec5269729defa0e25c3760
Chris Manton [Wed, 21 Oct 2020 07:43:32 +0000 (07:43 +0000)]
Use stack/l2cap/l2c_link::l2c_packets_completed am:
2986a9862f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1467024
Change-Id: I7031343b009ac63a7ed78ee71b8f515571240be2
Chris Manton [Wed, 21 Oct 2020 07:43:28 +0000 (07:43 +0000)]
Re-log entry into stack/gatt/gatt_api::GATT_ am:
5264c950cb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1467027
Change-Id: Ic7cea9dd9b41cda1ceda962b177cd8353ea757cc
Chris Manton [Wed, 21 Oct 2020 07:43:24 +0000 (07:43 +0000)]
Re-log stack/gap/gap_ble::client_connect_cback am:
65a2221eeb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1467026
Change-Id: I24b490b9bab1d022b7d212a45c57b59315229095
Chris Manton [Wed, 21 Oct 2020 07:43:20 +0000 (07:43 +0000)]
Add stack/l2cap/l2c_link::l2c_packets_completed am:
c9aad46809
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1467023
Change-Id: I21dd10730e7265da6fee579322ae383799c237a2
Chris Manton [Wed, 21 Oct 2020 07:43:11 +0000 (07:43 +0000)]
Add stack/acl/ble_acl::acl_ble_enhanced_connection_complete_from_shim am:
9712953a45
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1467025
Change-Id: Ib2d85e2b0ddd3c7c30ee3dfeef05a5d7c556993b
Chris Manton [Wed, 21 Oct 2020 07:42:39 +0000 (07:42 +0000)]
Remove never set #def BTIF_MIXED_MODE_INCLUDED am:
688b5a2a69
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466521
Change-Id: I54ec73251752c97718d4522940da468fff9cfda0
Chris Manton [Wed, 21 Oct 2020 06:51:38 +0000 (06:51 +0000)]
gd: Third entry gd acl shim am:
697d478004
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466520
Change-Id: I51fea25854a9053ccd1aba839e5b63e0fcc27119
Chris Manton [Wed, 7 Oct 2020 15:44:35 +0000 (08:44 -0700)]
Use stack/l2cap/l2c_link::l2c_packets_completed
Bug:
166280067
Tag: #refactor
Test: atest --host bluetooth_test_gd
Change-Id: I52ed1f0130500c516933b30ac28b029443ee53f4
Chris Manton [Mon, 19 Oct 2020 23:57:27 +0000 (16:57 -0700)]
Re-log entry into stack/gatt/gatt_api::GATT_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: Compiled and passed basic functionality
Change-Id: I79e887df6f1ff67eab94d6eefb8b63f88273a77a
Chris Manton [Mon, 19 Oct 2020 21:19:15 +0000 (14:19 -0700)]
Re-log stack/gap/gap_ble::client_connect_cback
Towards readable code
Bug:
163134718
Tag: #refactor
Test: Compiled and passed basic functionality
Change-Id: Ic1093dbfe77fd980fb8045bc0e16599a9978192c
Chris Manton [Wed, 7 Oct 2020 15:43:12 +0000 (08:43 -0700)]
Add stack/l2cap/l2c_link::l2c_packets_completed
Towards readable code
Bug:
163134718
Tag: #refactor
Test: Compiled and passed basic functionality
Change-Id: I956eb147794fee1f1c04c08853587891bfdf205b
Chris Manton [Mon, 19 Oct 2020 20:57:43 +0000 (13:57 -0700)]
Add stack/acl/ble_acl::acl_ble_enhanced_connection_complete_from_shim
Bug:
166280067
Tag: #refactor
Test: atest --host bluetooth_test_gd
Change-Id: I6b112841a85ad394223e98cc32f2661029a39f75
Chris Manton [Sat, 17 Oct 2020 22:46:00 +0000 (15:46 -0700)]
Remove never set #def BTIF_MIXED_MODE_INCLUDED
Towards readable code
Bug:
163134718
Tag: #refactor
Test: Compiled and passed basic functionality
Change-Id: I37a71035318f104274768f9ce3c5746527f80d80
Hansong Zhang [Wed, 21 Oct 2020 01:07:10 +0000 (01:07 +0000)]
BTM_SEC minor clean up am:
36c2695ccc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1468605
Change-Id: Icc66f4fa64da314df4b4e1f088ade16d4957e3ca
Chris Manton [Mon, 19 Oct 2020 21:28:02 +0000 (14:28 -0700)]
gd: Third entry gd acl shim
Bug:
166280067
Tag: #refactor
Test: atest --host bluetooth_test_gd
Change-Id: I1f6ab0511dae9c020a14b2754b0c862498784f19
Hansong Zhang [Tue, 20 Oct 2020 22:39:30 +0000 (15:39 -0700)]
BTM_SEC minor clean up
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4d5743de037d1f5f84802050d630bc8bd23b6d8d
Treehugger Robot [Tue, 20 Oct 2020 23:05:26 +0000 (23:05 +0000)]
Merge "Add shim role helper main/shim/helpers::ToLegacyRole" am:
35dbff6858
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466519
Change-Id: I75bf6c746da5de1ecafb4e5ba61a9414c2b2f49c
Hansong Zhang [Tue, 20 Oct 2020 23:04:26 +0000 (23:04 +0000)]
Introduce GD L2cap init flag am:
357fd19bc0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466464
Change-Id: I39088d427fca55ea9cc7e7cb0742c5a363a32040
Treehugger Robot [Tue, 20 Oct 2020 22:45:37 +0000 (22:45 +0000)]
Merge "Add shim role helper main/shim/helpers::ToLegacyRole"
Hansong Zhang [Mon, 19 Oct 2020 22:22:03 +0000 (15:22 -0700)]
Introduce GD L2cap init flag
Bug:
141555841
Test: cert/run --host
Tag: #gd-refactor
Change-Id: Ida422ee0738e206f45004f76e60e7f8c6b7d5acc
Chris Manton [Thu, 15 Oct 2020 15:50:39 +0000 (08:50 -0700)]
Add shim role helper main/shim/helpers::ToLegacyRole
Bug:
166280067
Tag: #refactor
Test: atest --host bluetooth_test_gd
Change-Id: Id8ba2b00ea738ca7a7b4dfc3f028c53bc305c421
Treehugger Robot [Tue, 20 Oct 2020 20:08:42 +0000 (20:08 +0000)]
Merge "Assert in default case" am:
df9b752f78
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1455167
Change-Id: I11511b36bcc7355f9a959a8fd8951c46c3f90c5a
Treehugger Robot [Tue, 20 Oct 2020 20:07:38 +0000 (20:07 +0000)]
Merge "GD Security: InternalEnforceSecurityPolicy" am:
93db05d15b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449382
Change-Id: I95f607f8b6f32a3941cf929313086306c6f1d0fb
Treehugger Robot [Tue, 20 Oct 2020 19:41:33 +0000 (19:41 +0000)]
Merge "Assert in default case"
Treehugger Robot [Tue, 20 Oct 2020 19:40:45 +0000 (19:40 +0000)]
Merge "GD Security: InternalEnforceSecurityPolicy"
Chris Manton [Tue, 20 Oct 2020 19:33:23 +0000 (19:33 +0000)]
gd: Plumb through ReadRemoteExtendedFeatures am:
22672b306d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466036
Change-Id: Ic0b00846b0488e8651907f437390b643c9d69c81
Martin Brabham [Tue, 20 Oct 2020 19:30:48 +0000 (19:30 +0000)]
Inclusive Language Updates am:
4d4a18a003
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1459349
Change-Id: Ie16652cd82fccc532c3487061b596bd979e69146
Łukasz Rymanowski [Tue, 20 Oct 2020 19:19:09 +0000 (19:19 +0000)]
stack/eatt: Add initial implementation for EATT am:
b6317be537
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1348752
Change-Id: Ib18ebd874157952cd3922ff84ecf0ab9b94863f5
Treehugger Robot [Tue, 20 Oct 2020 19:17:54 +0000 (19:17 +0000)]
Merge "Refactor advertising callback mechanism for GD" am:
33bc8c8990
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438712
Change-Id: Idda155d5f002bd0160e5c3c388fccdadc5cd43d3
Treehugger Robot [Tue, 20 Oct 2020 19:16:19 +0000 (19:16 +0000)]
Merge "Revert "gd: Plumb through ReadRemoteExtendedFeatures"" am:
de7f2688fa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466037
Change-Id: I54fa428e98351bfe255a4e6a3d42860914d255bb
Hansong Zhang [Tue, 20 Oct 2020 19:16:11 +0000 (19:16 +0000)]
L2cap link: Fix a potential nullptr exception am:
a95e67e725
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466517
Change-Id: I95d919cbb816012cc012ad7a538aa5654852d0f4
Chris Manton [Tue, 20 Oct 2020 19:14:18 +0000 (19:14 +0000)]
gd: Plumb through ReadRemoteExtendedFeatures am:
2956f27907
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466516
Change-Id: I6f7242f63a90010d6cd45cd46e041fc8c9c58681
Treehugger Robot [Tue, 20 Oct 2020 19:03:42 +0000 (19:03 +0000)]
[automerger skipped] Merge "Merge redfin/bramble support." am:
b5d9bd0014 -s ours
am skip reason: Change-Id I32df229c5561a1cae7be722865c378145de5a23a with SHA-1
92bd0c9e5c is in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466508
Change-Id: I18ecfcb2e2461e6e2057fec68d2e18382d216a83
Chris Manton [Mon, 19 Oct 2020 21:37:50 +0000 (14:37 -0700)]
gd: Plumb through ReadRemoteExtendedFeatures
Also plumb through ReadRemoteVersionInformation
Bug:
166280067
Tag: #refactor
Test: atest --host bluetooth_test_gd
Change-Id: Ida0265aec9f7a7e532097bbe0c550c36ba2e071e
Martin Brabham [Tue, 13 Oct 2020 23:42:07 +0000 (16:42 -0700)]
Inclusive Language Updates
slave -> peripheral
SLAVE -> PERIPHERAL
Slave -> Peripheral
BYPASS_INCLUSIVE_LANGUAGE_REASON=required_to_explain_the_update
Bug:
170342881
Tag: #refactor
Test: cert/run --host
Test: atest --host bluetooth_test_common
Test: atest --host bluetooth_test_gd
Test: atest net_test_btif
Change-Id: I4a3cccc0c1d182f172a21a6c70d569e5a89a5916
Merged-In: I4a3cccc0c1d182f172a21a6c70d569e5a89a5916
Łukasz Rymanowski [Fri, 8 May 2020 23:26:11 +0000 (01:26 +0200)]
stack/eatt: Add initial implementation for EATT
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: atest --host net_test_eatt
Change-Id: I934153625e69b1e20af657ded8f17238484cb65e
Treehugger Robot [Tue, 20 Oct 2020 12:12:41 +0000 (12:12 +0000)]
Merge "Refactor advertising callback mechanism for GD"
Treehugger Robot [Tue, 20 Oct 2020 05:58:48 +0000 (05:58 +0000)]
Merge "Revert "gd: Plumb through ReadRemoteExtendedFeatures""
Hansong Zhang [Mon, 19 Oct 2020 22:26:50 +0000 (15:26 -0700)]
L2cap link: Fix a potential nullptr exception
Bug:
141555841
Test: cert/run --host
Tag: #gd-refactor
Change-Id: I1550b750438364fa54d961d529e642c2beddb963
Chris Manton [Tue, 20 Oct 2020 02:51:42 +0000 (02:51 +0000)]
Revert "gd: Plumb through ReadRemoteExtendedFeatures"
This reverts commit
2956f2790709a159f7806b1b514aef2fe539a3e9.
Reason for revert: Broken Build
Change-Id: Ife01bd468d885bac8d270f280d3e5eb2ee0f29e1
Martin Brabham [Thu, 8 Oct 2020 21:11:57 +0000 (14:11 -0700)]
Assert in default case
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest:test_dut_initiated_no_input_no_output_no_input_no_output_twice_bond_and_enforce
Test: atest --host bluetooth_test_gd
Change-Id: Id41c0be842663b342b2c89fabbbdd702174ba6d1
Chris Manton [Mon, 19 Oct 2020 21:37:50 +0000 (14:37 -0700)]
gd: Plumb through ReadRemoteExtendedFeatures
Also plumb through ReadRemoteVersionInformation
Bug:
166280067
Tag: #refactor
Test: atest --host bluetooth_test_gd
Change-Id: If08f26cd1cbb6724689cc6b09268cf959285bb58
Martin Brabham [Mon, 5 Oct 2020 19:29:07 +0000 (12:29 -0700)]
GD Security: InternalEnforceSecurityPolicy
Currently, the logic is a little confusing, this CL should simplify it.
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest:test_dut_initiated_no_input_no_output_no_input_no_output_twice_bond_and_enforce
Test: atest --host bluetooth_test_gd
Change-Id: I19753a29487c4bf2c3b40189c0576526d39657c8
Treehugger Robot [Mon, 19 Oct 2020 23:20:09 +0000 (23:20 +0000)]
Merge "Merge redfin/bramble support."
Chris Manton [Mon, 19 Oct 2020 20:34:09 +0000 (20:34 +0000)]
gd: Second entry acl shim am:
da53a01b22
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460810
Change-Id: I1a5af242ddb79fd70b904c9188a5329210172ee4
Chris Manton [Mon, 19 Oct 2020 17:55:47 +0000 (17:55 +0000)]
Add main/shim/helpers::MakeLegacyBtHdrPacket am:
5b78e900e6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460808
Change-Id: I155880a6a848ee91d53e5b4310b497834d97cda4
Chris Manton [Mon, 19 Oct 2020 17:55:45 +0000 (17:55 +0000)]
Use tHCI_STATUS throughout shim interface am:
9fa03e8e5f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460807
Change-Id: Ie62e6a758fa7c5828039dc698c451c0f5f63766d
Xin Li [Mon, 19 Oct 2020 17:08:28 +0000 (10:08 -0700)]
Merge redfin/bramble support.
Bug:
171218636
Merged-In: I32df229c5561a1cae7be722865c378145de5a23a
Change-Id: Ie7ae2703a3ef41871147d42653809a5274a5c499
Chris Manton [Wed, 14 Oct 2020 15:40:38 +0000 (08:40 -0700)]
gd: Second entry acl shim
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: If2df6e773e6625f927426fc0bfa32ff33172cea7
Chris Manton [Wed, 14 Oct 2020 15:43:51 +0000 (08:43 -0700)]
Add main/shim/helpers::MakeLegacyBtHdrPacket
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Idc3083dbd8639b416880dbb8b07667a9356e82ed
Chris Manton [Wed, 14 Oct 2020 15:32:33 +0000 (08:32 -0700)]
Use tHCI_STATUS throughout shim interface
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ia6b600dbe0a8dbf99b1e97d6776a5dfe7f48248f
Łukasz Rymanowski [Mon, 19 Oct 2020 15:28:04 +0000 (15:28 +0000)]
l2c: Add missing event string am:
bc44ab6afd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458305
Change-Id: I32df229c5561a1cae7be722865c378145de5a23a
Łukasz Rymanowski [Mon, 19 Oct 2020 15:27:27 +0000 (15:27 +0000)]
l2c: Fix CoC default response am:
73cd2329c9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458304
Change-Id: I59b44bac4cab9ea770cf81799937967770f3e723
Łukasz Rymanowski [Mon, 19 Oct 2020 15:26:46 +0000 (15:26 +0000)]
l2c: Change std::vector to uint16[] in the tL2C_LCB am:
dc4a812fd6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458303
Change-Id: I4d6486a96dbe0d26478ef3f6d4ed2dc5c37fc27b
Łukasz Rymanowski [Tue, 13 Oct 2020 14:38:04 +0000 (14:38 +0000)]
l2c: Add missing event string
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: compile & manual
Change-Id: Icd9658ca7402a1a43ca0743ded6929833cd8957d
Łukasz Rymanowski [Tue, 13 Oct 2020 14:29:13 +0000 (14:29 +0000)]
l2c: Fix CoC default response
Looks like patch:
203c71a9020 Restore LE CoC l2cap conn rsp
was merged in similar time that:
4456dc7c91e stack/l2c: Add support for credit based connection oriented channels
However those two have a conflict.
This patch fixes that.
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: compile & manual
Change-Id: Ie252d15bdad9d20d9006908aa34e8b566583e4be
Łukasz Rymanowski [Tue, 13 Oct 2020 09:34:56 +0000 (09:34 +0000)]
l2c: Change std::vector to uint16[] in the tL2C_LCB
Since there are places where memset is done on tL2C_LCB
we can't keep std::vector in this struct
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: compile & manual
Change-Id: I2a9795e3c7dbe280b17725eac6333744440e89df
Treehugger Robot [Mon, 19 Oct 2020 09:29:19 +0000 (09:29 +0000)]
Merge "GD-Controller: Do not register NumberOfCompletedPacket without ACL layer" am:
456105020f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1464710
Change-Id: Iafb4d9fd99ba850d9d0bbcf58f45c9a697f845e5
Treehugger Robot [Mon, 19 Oct 2020 09:12:39 +0000 (09:12 +0000)]
Merge "GD-Controller: Do not register NumberOfCompletedPacket without ACL layer"
Chienyuan [Fri, 25 Sep 2020 10:02:31 +0000 (18:02 +0800)]
Refactor advertising callback mechanism for GD
Tag: #refactor
Bug:
169390539
Test: all sl4a tests for BLE advertising
Change-Id: If16058fa2ca07d27bf3a340b0aaff51e0f7ec232
Chris Manton [Sun, 18 Oct 2020 09:15:29 +0000 (09:15 +0000)]
enum-ify stack/include/btm_api_types::BTM_SEC_ am:
600515c780
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1459356
Change-Id: I5134b107c090df8d675b431444756b845dec9811
Chris Manton [Sun, 4 Oct 2020 23:11:58 +0000 (16:11 -0700)]
enum-ify stack/include/btm_api_types::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: I6b7d23ffdd22b4d9e98f214f2fee650ea35d765d
Chris Manton [Sat, 17 Oct 2020 23:58:27 +0000 (23:58 +0000)]
Add main/shim/helpers::debug::DumpBtHdr am:
81e50d6cf0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460809
Change-Id: I2e59386a1048a6467e202aa510e2527cf04cfe0a
Chris Manton [Wed, 14 Oct 2020 15:44:19 +0000 (08:44 -0700)]
Add main/shim/helpers::debug::DumpBtHdr
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I8593550041440c23f1b8eddef4e51a962e317768
OSDN Git Service
