OSDN Git Service
Treehugger Robot [Thu, 29 Oct 2020 00:52:26 +0000 (00:52 +0000)]
Merge "HCI: Add OobExtendedDataRequestReply"
Myles Watson [Wed, 28 Oct 2020 21:34:08 +0000 (14:34 -0700)]
HCI: Add OobExtendedDataRequestReply
Bug:
162984360
Test: ./cert/run --host Security
Change-Id: If95132b07f1c6543098c7570e4ce991a1cd0f32a
Treehugger Robot [Wed, 28 Oct 2020 22:12:19 +0000 (22:12 +0000)]
Merge "Add main/shim/helpers::ToAddressWithTypeFromLegacy"
Hansong Zhang [Wed, 28 Oct 2020 17:37:56 +0000 (10:37 -0700)]
LE COC shim: Implement GetMtu()
So the client knows how to split their SDU.
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Test: CtsVerifier
Change-Id: I9dd3fdac1ec7c982d38d9a8751fa0e135b862bb8
Treehugger Robot [Wed, 28 Oct 2020 21:05:05 +0000 (21:05 +0000)]
Merge "gd: Fix PDL of LeSetPeriodicAdvertisingEnable"
Chris Manton [Wed, 28 Oct 2020 17:20:56 +0000 (10:20 -0700)]
Add main/shim/helpers::ToAddressWithTypeFromLegacy
Bug:
171568335
Test: CtsVerifier insecure client/server priority
Tag: #refactor
Change-Id: I0832728d579930bf39cda0df4602f661bbfeca2f
Hansong Zhang [Wed, 28 Oct 2020 17:00:36 +0000 (10:00 -0700)]
LE COC shim: Fix outgoing connection callback
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib5bf899fa2c05594f8f3e2d9074fc76f16fb3d4d
Łukasz Rymanowski [Wed, 28 Oct 2020 11:42:15 +0000 (11:42 +0000)]
eatt: Fix eatt counter in tcb
Problem visible in unit tests
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: atest --host net_test_eatt
Change-Id: I8ee1985dee87bb73d127ebfee3ca8e5287975914
Łukasz Rymanowski [Wed, 28 Oct 2020 11:41:38 +0000 (11:41 +0000)]
eatt/unit_test: Extend unit test to verify eatt counter
This will show the problem fixed in next patch
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: atest --host net_test_eatt
Change-Id: I977b1f40a8acb8d6a78db6a9e2f802468444910f
Łukasz Rymanowski [Wed, 28 Oct 2020 13:04:32 +0000 (13:04 +0000)]
eatt/unit_test: Use HCI_ROLE_PERIPHERAL as this is available now
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: atest --host net_test_eatt
Change-Id: Ic054ddb4bb66d403f354ce77bcf3173f7daef525
Chienyuan [Wed, 28 Oct 2020 08:56:03 +0000 (16:56 +0800)]
gd: Fix PDL of LeSetPeriodicAdvertisingEnable
Tag: #gd-refactor
Bug:
169125803
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: I2eb0e716db5563cfebffee910540bec1d86fbb37
Hansong Zhang [Wed, 28 Oct 2020 05:28:02 +0000 (22:28 -0700)]
L2cap LE COC shim
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Test: CtsVerifier
Change-Id: Iac8ca2cecd109d24e8218a5b0ba25a8aef27b8ba
Hansong Zhang [Tue, 27 Oct 2020 23:35:06 +0000 (16:35 -0700)]
L2cap: LE specific disconnect and write API
In shim layer we handle classic and LE separately.
For now, LE API redirects to classic.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2ba1dba32f1102631671770ee603881c4b47efeb
Hansong Zhang [Tue, 27 Oct 2020 23:36:46 +0000 (16:36 -0700)]
GAP: Simplify gap_sec_check_complete
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie0c2404964e6941c7d993b2f5230beda35eb8244
Chris Manton [Tue, 27 Oct 2020 21:02:57 +0000 (14:02 -0700)]
Wire link_le_on_connection_update into acl shim
Bug:
171568335
Test: CtsVerifier insecure client/server priority
Tag: #refactor
Change-Id: Ieac3be19c960d00725ee0df7e5919f77464ab98c
Chris Manton [Tue, 27 Oct 2020 20:49:18 +0000 (13:49 -0700)]
Use stack/acl/ble_acl::acl_ble_update_event_received
Bug:
171568335
Test: CtsVerifier insecure client/server priority
Tag: #refactor
Change-Id: Ifd192ae395177a904a1ed4b482652404b294a167
Chris Manton [Tue, 27 Oct 2020 20:38:25 +0000 (13:38 -0700)]
Add stack/acl/ble_acl::acl_ble_update_event_received
Bug:
171568335
Test: CtsVerifier insecure client/server priority
Tag: #refactor
Change-Id: I8bd5c9d93d5f0417da0da8f11edb59e14b01a4e4
Chris Manton [Tue, 27 Oct 2020 20:46:44 +0000 (13:46 -0700)]
Use proper gatt_notify_conn_update::status type at corresponding level
Bug:
171568335
Test: CtsVerifier insecure client/server priority
Tag: #refactor
Change-Id: I9d13cf5607a254c7abcade0df2c402de8a9e0911
Hansong Zhang [Tue, 27 Oct 2020 19:27:17 +0000 (12:27 -0700)]
LE COC: Let L2cap send connect rsp
No need to send connect rsp from client
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Change-Id: I2adf73b8086d297930d3e32cab98dd90bc2d9ff1
Chris Manton [Tue, 27 Oct 2020 17:30:43 +0000 (10:30 -0700)]
Add READ_REMOTE_VERSION_INFORMATION to status list
Tag: #refactor
Bug:
171801837
Test: acts/bin/act.py -tp ~/Goog/tools/test/connectivity -tc BleCocTest
Change-Id: I17759c2040bd620f2cbe29b33d5f092079c937f9
Treehugger Robot [Tue, 27 Oct 2020 18:20:00 +0000 (18:20 +0000)]
Merge "GD Security Shim: make required calls to shim"
Hansong Zhang [Tue, 27 Oct 2020 00:29:24 +0000 (17:29 -0700)]
LE L2cap: Add COC config to registration
So we can send connect rsp for user.
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Change-Id: I6423f9c27e75c9665d91482fd6ca218492b18414
Chris Manton [Mon, 26 Oct 2020 23:37:32 +0000 (16:37 -0700)]
Disable EATT as does not pass all tests
Tag: #feature
Bug:
159786353
Test: acts/bin/act.py -tp ~/Goog/tools/test/connectivity -tc BleCocTest
Change-Id: Id8243d9d9473293e2e1fc341b18d7d40cf1da14b
Treehugger Robot [Mon, 26 Oct 2020 23:13:26 +0000 (23:13 +0000)]
Merge "A2DP offload: modify the A2DP offload SCMS-T_Enable with SCMS-T header"
Martin Brabham [Wed, 7 Oct 2020 21:57:07 +0000 (14:57 -0700)]
GD Security Shim: make required calls to shim
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I04611d1b367e8cb0cc6c80bfeed38852d5998b20
Chris Manton [Mon, 26 Oct 2020 16:17:17 +0000 (09:17 -0700)]
Re-log stack/btm/btm_ble::btm_ble_start_sec_check
Toward readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I083d8a4af4af47b9a78f61d4618342abb76acbec
Chris Manton [Mon, 26 Oct 2020 16:17:29 +0000 (09:17 -0700)]
Re-log stack/l2cap/l2c_ble::l2ble_sec_access_req
Toward readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I520a8ce93f1192960425291ed905c9bf3aa1cc26
Chris Manton [Mon, 26 Oct 2020 16:16:50 +0000 (09:16 -0700)]
btm_acl_removed: Check for null as acl may have already closed
Bug:
159815595
Tag: #refactor
Test: acts.py BleCocTest
Change-Id: I7a5312d4d929280de73442885100714264cd1457
Treehugger Robot [Mon, 26 Oct 2020 00:30:15 +0000 (00:30 +0000)]
Merge "Properly reset tL2C_CCB::ecoc"
Hansong Zhang [Sat, 24 Oct 2020 20:46:56 +0000 (13:46 -0700)]
ACL: Refactor remote version/feature response
Separate the packet parsing and handling part, so that we can parse the
packet in GD L2cap and handle it in legacy stack.
When GD L2cap is enabled, don't send these request in legacy stack.
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: I8be299f1e61cb790ce0d0b7a81d3e6a99bc8d336
Hansong Zhang [Fri, 23 Oct 2020 23:31:17 +0000 (16:31 -0700)]
GD L2cap: Pass more link callbacks to Security
Send Remote version request and supported feature request upon link
connection.
Security might be interested in LMP version and features, and ACL handle
(for legacy).
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Change-Id: I8c2f373cbdc2850a26c424fb370a041f4e183555
Chris Manton [Sun, 25 Oct 2020 20:25:18 +0000 (13:25 -0700)]
Properly reset tL2C_CCB::ecoc
Bug:
171657571
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I491a7cba9b28dcc4d02d7de4463a3512e8fce719
Chris Manton [Sat, 24 Oct 2020 21:09:07 +0000 (14:09 -0700)]
gd: Pull out READ_REMOTE_VERSION shared between classic and le
Test: atest --host bluetooth_test_gd
Test: acts.py BleCocTest ## With gd_hci=false
Test: acts.py BleCocTest ## With gd_acl=true
Bug:
171634583
Tag: #refactor
Change-Id: I53a49fec950755c13e4786be9aae936c0c2b242a
Chris Manton [Sat, 24 Oct 2020 21:43:31 +0000 (14:43 -0700)]
Only send ReadRemoteVersionRequest in legacy mode
gd acl can only accept an event for either classic
or le, but not both.
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I719f09a380e7b75da7c40ffc136038ccaea90812
Chris Manton [Sat, 24 Oct 2020 21:22:03 +0000 (14:22 -0700)]
Revert "Should not send classic commands on le link"
This reverts commit
25b8b04caa3c2c4b218f8d56f5f72e7ca1e24f8c.
Turns out this is a command that may be run on both le and br_edr links
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ieb3de7c6046f18b30805b7486441039b591f929b
Hansong Zhang [Fri, 23 Oct 2020 23:27:18 +0000 (16:27 -0700)]
GD ACL: on_read_remote_supported_features_complete
Use OnReadRemoteExtendedFeaturesComplete callback to send it to L2cap
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Change-Id: I04398f308028c1419072e87a6990aab6f6be1795
Baligh Uddin [Sat, 24 Oct 2020 01:40:47 +0000 (01:40 +0000)]
Merge "Cleanup references to system/core/base -> system/libbase"
Hansong Zhang [Fri, 23 Oct 2020 19:31:12 +0000 (12:31 -0700)]
Clean up log spam in avrcp and a2dp
Now we don't see bugs in avrcp and a2dp sbc encoder often, move them to
verbose logging.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8475b6914edb5c06927d8578d2d035c49a41efdc
Treehugger Robot [Fri, 23 Oct 2020 18:55:21 +0000 (18:55 +0000)]
Merge changes Ic1411faf,I0ef22f28,I645b787d,Ief031db6,I5c494deb, ...
* changes:
Remove unused def SMP_DEBUG
Remove name from BTM_SecAddBleDevice
Re-log stack/l2cap/l2c_ble::
enum-ify link stack/acl/btm_acl::policy settings
Streamline main/shim/acl::_reason
Streamline stack/btm/btm_ble_addr::btm_ble_addr_resolvable
Streamline stack/btm/btm_ble_gap::btm_ble_update_adv_flag
Streamline stack/btm/btm_ble_addr::btm_ble_resolve_random_addr
enum-ify stack/btm/btm_ble_gap::BTM_BLE_
Add main/shim/acl_legacy_interface::auth_complete
Chris Manton [Sun, 11 Oct 2020 21:36:53 +0000 (14:36 -0700)]
Remove unused def SMP_DEBUG
Toward readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic1411faf31fd6c4dc66282bfe42a0ec47c969bb1
Chris Manton [Fri, 23 Oct 2020 02:47:49 +0000 (19:47 -0700)]
Remove name from BTM_SecAddBleDevice
bd_name is always nullptr
Toward readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0ef22f288425dad0cc08d4e43acc12e5dd51d6dd
Chris Manton [Thu, 8 Oct 2020 21:25:38 +0000 (14:25 -0700)]
Re-log stack/l2cap/l2c_ble::
Please "don\'t" use apostrophes
Towards grepable code
Bug:
163134718
Tag: #refactor
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I645b787dffa54d1f1829fca1212a4fa811e1f51e
Chris Manton [Sun, 11 Oct 2020 03:55:47 +0000 (20:55 -0700)]
enum-ify link stack/acl/btm_acl::policy settings
And also move to only use location
And restrict from header into compilation unit
Toward readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ief031db624bf1363ee3ec4043efafcfdc4be1b59
Chris Manton [Tue, 20 Oct 2020 15:06:13 +0000 (08:06 -0700)]
Streamline main/shim/acl::_reason
Bug:
166280067
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5c494deb85fbb3101602078dcaeefc98ac695754
Chris Manton [Tue, 13 Oct 2020 20:58:56 +0000 (13:58 -0700)]
Streamline stack/btm/btm_ble_addr::btm_ble_addr_resolvable
Toward readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6600ac7d3fdc1a9ff099b0ffa8c9b1826c6db456
Chris Manton [Tue, 13 Oct 2020 21:19:35 +0000 (14:19 -0700)]
Streamline stack/btm/btm_ble_gap::btm_ble_update_adv_flag
Toward readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I241cf791f672d0003419c7e8e26b4baf2089d681
Chris Manton [Tue, 13 Oct 2020 20:34:43 +0000 (13:34 -0700)]
Streamline stack/btm/btm_ble_addr::btm_ble_resolve_random_addr
Toward readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifc5c988e6a5dd8540c5465639022a355ee9efcbf
Chris Manton [Tue, 13 Oct 2020 21:19:08 +0000 (14:19 -0700)]
enum-ify stack/btm/btm_ble_gap::BTM_BLE_
Toward readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Icb54b5f68c11bcb0a28b1cf25abcaf68c734d6ca
Chris Manton [Fri, 16 Oct 2020 01:16:57 +0000 (18:16 -0700)]
Add main/shim/acl_legacy_interface::auth_complete
Bug:
166280067
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2ad8753860ec78441a22c7f3e071beb11b9773c6
Baligh Uddin [Fri, 23 Oct 2020 14:33:47 +0000 (14:33 +0000)]
Cleanup references to system/core/base -> system/libbase
BUG:
157656545
Test: TH
Change-Id: I6b04e7340d58215ccf183e4b086023281e0a9951
Alice Kuo [Wed, 14 Oct 2020 10:31:54 +0000 (18:31 +0800)]
A2DP offload: modify the A2DP offload SCMS-T_Enable with SCMS-T header
Follow the Android HCI requirement for the 'Start A2DP Offload' cmd, it
should bring the SCMS-T header in the 'SCMS-T Enable' field as SCMS-T is
enabled. Get the SCMS-T active status of the peer devices as building
the offload start req cmd, and fill the SCMS-T header based the active
status.
Bug:
170785181
Tag: #feature
Test: connect with Sony WH-1000XM4, check the SCMS-T_Enable correctness
Test: atest --test-mapping system/bt
Change-Id: I6003b50a09f010942b37436497b06e06180b2069
Jakub Pawlowski [Fri, 23 Oct 2020 11:14:14 +0000 (11:14 +0000)]
Revert "BTM_ACL: Remove unused code"
This reverts commit
85a4ce1ebd16bb20e87edac88ba0cbd71fa92d46.
Reason for revert: This is needed for LE Audio
Change-Id: Iaed065aef5f40e066d08004699c07dea2f48c94a
Treehugger Robot [Fri, 23 Oct 2020 07:04:14 +0000 (07:04 +0000)]
Merge changes from topic "gd_security_shim"
* changes:
GD Security: pipe in determined just_works flag
GD Security Shim: Make ConfirmationData have strict types
Hansong Zhang [Thu, 22 Oct 2020 20:17:35 +0000 (13:17 -0700)]
Refactor btm_remove_acl
Use ACL handle instead.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4447134f80f39e4afaf051e49c10a55ea68f9f5b
Hansong Zhang [Thu, 22 Oct 2020 22:45:50 +0000 (15:45 -0700)]
BTM_BLE_GAP: Clean up log spam
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I35bca19f53ca865697f810524bb911c8668e08f5
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 [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 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 [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
Martin Brabham [Wed, 7 Oct 2020 21:53:38 +0000 (14:53 -0700)]
GD Security: pipe in determined just_works flag
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I480898445bf65f8034a1519cc3fba4572e613c56
Martin Brabham [Wed, 21 Oct 2020 07:41:42 +0000 (00:41 -0700)]
GD Security Shim: Make ConfirmationData have strict types
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: atest --host bluetooth_test_common
Change-Id: I6684d53b7fe154d80d0869333f1d6d19459d1090
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
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 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 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 [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
OSDN Git Service
