OSDN Git Service
Zach Johnson [Fri, 29 Jan 2021 22:02:47 +0000 (22:02 +0000)]
Merge "rusty-gd: Use entire slice during packet parsing"
Chris Manton [Fri, 29 Jan 2021 21:45:57 +0000 (21:45 +0000)]
Merge changes I9f76c7f7,Id5863a3c,I070cc0c0,I09f31af5,I4d4f2b79, ...
* changes:
btm_log: Add pairing state changes
Move stack/include/bt_types::FLOW_SPEC => stack/l2c
Move stack/include/::btm_api into btm_ble_api
Include security_client_callbacks
Break out security callbacks stack/include/security_client_callbacks
Introduce stack/include/sco_client_callbacks
Add stack/acl/btm_acl::SupportTransparentSynchronousData
Expand stack/include/btm_client_interface
Add explict FALLTHROUGH_INTENDED to package
Re-log stack/rfcomm/rfc_mx_fsm::rfc_mx_sm_execute
Re-log stack/btm/btm_sec::BTM_SetSecurityLevel
Re-log stack/btm/btm_sec::btm_sec_mx_access_request
Re-log stack/btm/btm_sco::BTM_SetEScoMode
Re-log stack/btm/btm_sco::btm_send_connect_request
Re-log stack/btm/btm_ble_gap::BTM_BleGetVendorCapabilities
Re-log stack/btm/btm_ble::btm_ble_set_random_address
Re-log stack/acl/btm_pm::
Re-log bta/av/bta_av_api::BTA_AvStart
Re-log bta/ag/bta_ag_main::bta_ag_api_result
Add stack/include/btm_api_types::security_mode_text
Add stack/btm/security_device_record::security_state_text
Streamline stack/btm/btm_sco::btm_sco_connected
Enum-ify bta/include/bta_api::tBTA_DM_PM_ACTION_BITMASK
Canonicalize stack/gatt/bta_gattc_act::bta_gattc_cl_cback
Use proper types btm_sco_connected tHCI_STATUS
Use tBTA_AG_SCB::ToString
Re-log stack/btm/btm_sec::btm_sec_disconnected
Streamline stack/btm/btm_sec::btm_sec_disconnect
Stat-ify stack/gatt/att_protocol
Hansong Zhang [Fri, 22 Jan 2021 08:42:39 +0000 (00:42 -0800)]
Remove some unused stuff
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: I6fcaf472341920f476608974bf3bf1183b9eb212
Zach Johnson [Fri, 29 Jan 2021 19:27:20 +0000 (19:27 +0000)]
Merge "rusty-gd: Serialize size fields."
Jack He [Fri, 29 Jan 2021 19:02:10 +0000 (19:02 +0000)]
Merge "[GD ACL] Make ACL packets non-flushable by default"
Chienyuan [Fri, 29 Jan 2021 09:55:23 +0000 (17:55 +0800)]
gd: Add dependency for Advertising/Scanning/L2CAP module
Tag: #gd-refactor
Bug:
177044452
Test: gd/cert/run --host
Test: manual, set init flag
Change-Id: I831d98cc5ed62a37924b7c465283401882b92b89
Hansong Zhang [Fri, 29 Jan 2021 01:12:34 +0000 (17:12 -0800)]
Fix some sco packet type features
Tag: #gd-refactor
Bug:
141555841
Test: cert/run
Change-Id: I866cfe8763635901406b8563ecc5d4801ebccb87
Chris Manton [Tue, 26 Jan 2021 19:31:57 +0000 (11:31 -0800)]
btm_log: Add pairing state changes
Toward loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I9f76c7f7a1ac17bc3161a26c318b8bcda087ceec
Chris Manton [Tue, 26 Jan 2021 00:06:41 +0000 (16:06 -0800)]
Move stack/include/bt_types::FLOW_SPEC => stack/l2c
Towards functional aggregation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Id5863a3ce8a55c2573346ce4f749d9434f2549e7
Chris Manton [Mon, 25 Jan 2021 17:31:43 +0000 (09:31 -0800)]
Move stack/include/::btm_api into btm_ble_api
Towards functional aggregation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I070cc0c031fbf5ecdf6b444faf167a540e0ac1e2
Chris Manton [Mon, 25 Jan 2021 17:30:54 +0000 (09:30 -0800)]
Include security_client_callbacks
Toward modular code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I09f31af591e7dc4884cf32e11976c7a681bc9585
Chris Manton [Mon, 25 Jan 2021 17:30:14 +0000 (09:30 -0800)]
Break out security callbacks stack/include/security_client_callbacks
Towards modular code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I4d4f2b7963107778d90bf7df7dd6696edf2a0028
Chris Manton [Mon, 25 Jan 2021 01:00:11 +0000 (17:00 -0800)]
Introduce stack/include/sco_client_callbacks
Towards modular code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I1ca5ff09052799cc487ee3baf1b1851b8db32384
Chris Manton [Mon, 25 Jan 2021 22:32:53 +0000 (14:32 -0800)]
Add stack/acl/btm_acl::SupportTransparentSynchronousData
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: If5b719099a3e40a1aab573fdc4c4bbca2e9d8c43
Chris Manton [Sun, 24 Jan 2021 23:41:01 +0000 (15:41 -0800)]
Expand stack/include/btm_client_interface
Towards modular code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I3e7f8ff3e4d07c90f3c4eceff41777c2091abdca
Chris Manton [Fri, 22 Jan 2021 22:56:11 +0000 (14:56 -0800)]
Add explict FALLTHROUGH_INTENDED to package
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I0ad90ff42f516f94f3399b6c64d45772618685bb
Chris Manton [Sat, 19 Dec 2020 02:00:42 +0000 (18:00 -0800)]
Re-log stack/rfcomm/rfc_mx_fsm::rfc_mx_sm_execute
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I632bd0004a824f763c01508391e5105d75c96676
Chris Manton [Sat, 26 Dec 2020 23:46:40 +0000 (15:46 -0800)]
Re-log stack/btm/btm_sec::BTM_SetSecurityLevel
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I29779be6d31881b194cd1ad021f092ff65f2b9f6
Chris Manton [Tue, 15 Dec 2020 00:09:24 +0000 (16:09 -0800)]
Re-log stack/btm/btm_sec::btm_sec_mx_access_request
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I6361fa2ce46c4e83a2efb35c8dcf72c6f93da9bf
Chris Manton [Wed, 6 Jan 2021 22:33:11 +0000 (14:33 -0800)]
Re-log stack/btm/btm_sco::BTM_SetEScoMode
Towards readable and loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I627b1e2618a8b0ff056fb5c11d9bf17811167b13
Chris Manton [Wed, 6 Jan 2021 22:30:58 +0000 (14:30 -0800)]
Re-log stack/btm/btm_sco::btm_send_connect_request
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Id6bb24c2ebccb63f4276a6aff21202b434078b76
Chris Manton [Sat, 19 Dec 2020 04:21:55 +0000 (20:21 -0800)]
Re-log stack/btm/btm_ble_gap::BTM_BleGetVendorCapabilities
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I56525f57c1a40f6f297d98347326da670a629196
Chris Manton [Sat, 19 Dec 2020 04:22:03 +0000 (20:22 -0800)]
Re-log stack/btm/btm_ble::btm_ble_set_random_address
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I96d5fcadc00e02b646988655ada6d6d8cbd24d5d
Chris Manton [Sat, 19 Dec 2020 17:54:13 +0000 (09:54 -0800)]
Re-log stack/acl/btm_pm::
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I5a150b6ce4adf7ed94d4f288ab53f63d64403fc6
Chris Manton [Sat, 19 Dec 2020 01:58:11 +0000 (17:58 -0800)]
Re-log bta/av/bta_av_api::BTA_AvStart
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I31660bf8a839f30c7dcded3cca943f43f9ba2de2
Chris Manton [Sat, 26 Dec 2020 23:34:35 +0000 (15:34 -0800)]
Re-log bta/ag/bta_ag_main::bta_ag_api_result
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I15e25e93c7604e78e67790d4c177eda9e00cde91
Chris Manton [Sat, 17 Oct 2020 15:49:23 +0000 (08:49 -0700)]
Add stack/include/btm_api_types::security_mode_text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ifbc618d55052ae6d090f2deb6d8f4de4e065fd85
Chris Manton [Thu, 14 Jan 2021 07:01:37 +0000 (23:01 -0800)]
Add stack/btm/security_device_record::security_state_text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Id1b18be2898e8892b420aa4aa77659b99fd73d34
Chris Manton [Wed, 6 Jan 2021 22:32:05 +0000 (14:32 -0800)]
Streamline stack/btm/btm_sco::btm_sco_connected
Towards readable and loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ie23d0a1fe9d97f5ea600a5d1e41ed4b3851235a5
Chris Manton [Sat, 19 Dec 2020 06:29:32 +0000 (22:29 -0800)]
Enum-ify bta/include/bta_api::tBTA_DM_PM_ACTION_BITMASK
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I9a638a0f220e48127baa8be5952931d03d158d3b
Chris Manton [Fri, 20 Nov 2020 00:57:04 +0000 (16:57 -0800)]
Canonicalize stack/gatt/bta_gattc_act::bta_gattc_cl_cback
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Id0c387331d72a54d919dbbda6d796234b614890b
Chris Manton [Thu, 21 Jan 2021 05:45:49 +0000 (21:45 -0800)]
Use proper types btm_sco_connected tHCI_STATUS
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: If40028eb5adc660c05798dc6d01f5b83ed7fb480
Chris Manton [Tue, 15 Dec 2020 00:16:11 +0000 (16:16 -0800)]
Use tBTA_AG_SCB::ToString
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ia10f71639e318f75c6b72698fa64651c89d1ef05
Chris Manton [Thu, 3 Dec 2020 17:45:39 +0000 (09:45 -0800)]
Re-log stack/btm/btm_sec::btm_sec_disconnected
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I0adc8e819ec71da7ef1493fff917e685ffa72757
Chris Manton [Thu, 14 Jan 2021 21:59:33 +0000 (13:59 -0800)]
Streamline stack/btm/btm_sec::btm_sec_disconnect
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I69339757cfea9e9b01587b788a10510de25fc00f
Chris Manton [Fri, 20 Nov 2020 17:39:33 +0000 (09:39 -0800)]
Stat-ify stack/gatt/att_protocol
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I74a338b39a2e2fa2b727b94c502b7a698258747f
Treehugger Robot [Fri, 29 Jan 2021 10:41:13 +0000 (10:41 +0000)]
Merge "Use updated SIG wording: blacklist to rejectlist"
Jack He [Fri, 29 Jan 2021 01:43:12 +0000 (17:43 -0800)]
[GD ACL] Make ACL packets non-flushable by default
* So that enhanced flush command does not discard pending ACL packets
that may be one of those A2DP commands
Bug:
177278022
Bug:
178752129
Test: gd/cert/run
Tag: #gd-refactor
Change-Id: Ibf168d0a022c8ef93058e0e986566b40c808e003
Hansong Zhang [Wed, 20 Jan 2021 20:48:48 +0000 (12:48 -0800)]
L2cap shim improvements
Implement FlushChannel, GetNumBufferedPackets, L2CA_ReadConnectionAddr,
and L2CA_ReadRemoteConnectionAddr.
Get the identity address and type from BTM.
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: I0674057ba6e23ffab6f404972514bbff24c4e919
Hansong Zhang [Thu, 28 Jan 2021 22:15:18 +0000 (14:15 -0800)]
Skip LE Security test
Test: cert/run
Bug:
178541388
Tag: #stability
Change-Id: I13f23d5b88d749608d833baa3378e3d0eddb4e82
Jeongik Cha [Thu, 28 Jan 2021 15:13:10 +0000 (15:13 +0000)]
Merge "Specify version for aidl_interface explicitly"
Josh Wu [Thu, 28 Jan 2021 11:55:29 +0000 (19:55 +0800)]
Use updated SIG wording: blacklist to rejectlist
BYPASS_INCLUSIVE_LANGUAGE_REASON=None
Tag: #refactor
Bug:
170342881
Test: atest BluetoothInstrumentationTests
Change-Id: I63e6e1ef003558433c51061bc2781c8f60f8a037
Qasim Javed [Thu, 28 Jan 2021 03:08:57 +0000 (19:08 -0800)]
rusty-gd: Use entire slice during packet parsing
The field offsets for the child packets are relative to the parent
packet so we do not need to use specify a starting offset when calling
the child packet's parse method.
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I472f3365259c653143a973c4412d685c20f62808
Hansong Zhang [Wed, 27 Jan 2021 18:07:30 +0000 (10:07 -0800)]
L2cap FCR: Use MTU from registration
Bug:
174845935
Test: manual
Tag: #stability
Change-Id: I817bc44a436de150aa12377741f99d468f42df73
Myles Watson [Wed, 27 Jan 2021 21:44:57 +0000 (21:44 +0000)]
Merge changes I600c39dd,Ib9f8ace3,Ib9c717b5
* changes:
gd: Fix advertising id not removed bug
gd: Prevent legacy address rotation when GD enabled
gd: Handle inquiry result callback
Qasim Javed [Wed, 27 Jan 2021 20:45:22 +0000 (12:45 -0800)]
rusty-gd: Serialize size fields.
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ia2f2acddd43960deca96b037295e17203038b1fd
Jakub Tyszkowski [Mon, 4 Jan 2021 14:06:13 +0000 (15:06 +0100)]
iso: Fix handling same sequence number
When calculating the sequence number it may happen that we
compute the same value as for previous packet. If that happens
we manually increment the value by one. This was a problem when
yet another packet comes in a short interval and calculated seq.
number is still the same. Our calcualted seq. number for current
packet can now be lower than the previos one (after the previous
one was manually incremented). This resulted in wrongly calculated
packet lost counter dropping below 0.
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: atest --host net_test_btm_iso
Change-Id: I7d726ef292e85851af6383bfc8f4bcf125ccbf54
Jack He [Tue, 26 Jan 2021 08:40:36 +0000 (00:40 -0800)]
[GD Cert] Support Python 3.9
* AOSP upgraded to Python 3.9 recently
* Use Python 3.9 as default test runner
* Modify logging lines in setup.py
Bug:
178410571
Tag: #gd-refactor
Test: gd/cert/run
Change-Id: I65cb619d747102d8f145511feb20a40d8bf38790
Jeffrey Vander Stoep [Tue, 26 Jan 2021 18:41:47 +0000 (18:41 +0000)]
Merge "Use new tokio 1.x API functions."
Jeongik Cha [Tue, 26 Jan 2021 13:35:08 +0000 (22:35 +0900)]
Specify version for aidl_interface explicitly
Bug:
150578172
Test: m
Change-Id: I0d79b6d36bd7fd3f9a595ed5f45cbc6689a4aff5
Chienyuan [Tue, 26 Jan 2021 11:46:30 +0000 (19:46 +0800)]
gd: Fix advertising id not removed bug
Tag: #gd-refactor
Bug:
177044452
Test: gd/cert/run --host
Change-Id: I600c39dd84b7712f905f327ea419c287a02c97f8
Chienyuan [Tue, 26 Jan 2021 09:46:58 +0000 (17:46 +0800)]
gd: Prevent legacy address rotation when GD enabled
Tag: #gd-refactor
Bug:
177044452
Test: gd/cert/run --host
Test: manual
Change-Id: Ib9f8ace378704077d4375ca2a46eeab20f92aef0
Jakub Pawlowski [Tue, 26 Jan 2021 09:05:30 +0000 (09:05 +0000)]
Merge "gattc: Fix uninitialized memory issue which could lead to crash"
Chienyuan [Fri, 22 Jan 2021 10:12:30 +0000 (18:12 +0800)]
gd: Handle inquiry result callback
Tag: #gd-refactor
Bug:
177044452
Test: gd/cert/run --host
Test: manual, start inquiry from Settings
Change-Id: Ib9c717b58cdd7feda82496b29ea653c732a32dc4
Ivan Lozano [Wed, 20 Jan 2021 14:28:28 +0000 (09:28 -0500)]
Use new tokio 1.x API functions.
Some functions have been renamed or removed as part of the tokio
1.x upgrade. This CL refactors the code to address that.
Also included are a couple minor rustfmt style changes as part of
submission.
Bug:
177808007
Test: mma
Change-Id: Ia147257b0cddb628866b34c9f755b1fe3c63e46d
Myles Watson [Mon, 25 Jan 2021 18:50:28 +0000 (18:50 +0000)]
Merge "Fix A2dp encoder counter deviation."
Łukasz Rymanowski [Fri, 22 Jan 2021 09:17:53 +0000 (10:17 +0100)]
gattc: Fix uninitialized memory issue which could lead to crash
This is regression after
813bf3ddd gattc: Extend gattc queue with mtu exchange
This patch makes sure that new mtu_cb and mtu_cb_data
are set to 0 when not used.
Tag: #feature
Test: CtsVerifier
Sponsor: jpawlowski@
Fixes:
178129488
Bug:
178129488
Change-Id: Ia550c99ee7292fa275150791fc73e92ae791d91c
Chienyuan [Sun, 24 Jan 2021 14:43:13 +0000 (22:43 +0800)]
gd: Enable scanning flag
Tag: #gd-refactor
Bug:
177044452
Test: manual
Change-Id: I754ffb63d3dc116203bf58a52816a7010d206492
Zach Johnson [Sun, 24 Jan 2021 00:19:35 +0000 (00:19 +0000)]
Merge "rusty-gd: Added methods to compute size"
Qasim Javed [Fri, 22 Jan 2021 22:53:16 +0000 (14:53 -0800)]
rusty-gd: Added methods to compute size
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Iadd4663eac45d3b61ea891def71ece4bba0cdcf6
Zach Johnson [Fri, 22 Jan 2021 22:33:36 +0000 (14:33 -0800)]
rusty-gd: move gddi-macros to gddi/macros
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I30b553a92539212bbe7456c3f4794706d3e8950e
Zach Johnson [Fri, 22 Jan 2021 22:23:53 +0000 (14:23 -0800)]
rusty-gd: move facade_helpers to facade/helpers
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ie392496d731a7f589e40e0c6ce30d7b7c39dead6
Zach Johnson [Fri, 22 Jan 2021 22:17:40 +0000 (14:17 -0800)]
rusty-gd: remove unused grpc-macros content
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I779b8c8d06d621bec6bd365e42f1876af2da2b4e
Zach Johnson [Fri, 22 Jan 2021 22:04:44 +0000 (14:04 -0800)]
rusty-gd: reorg rust/acl to rust/link
to prepare the way for sco, iso, etc, and encompass common link
management like power, etc
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I972a5c8c9736d2c3a9359111e5cbdafa62478d3f
Jeffrey Vander Stoep [Fri, 22 Jan 2021 19:38:26 +0000 (19:38 +0000)]
Merge "Explicitly add static dependencies"
Daren Liao [Fri, 20 Nov 2020 06:23:17 +0000 (14:23 +0800)]
Fix A2dp encoder counter deviation.
[Description]
Fix A2dp encoder counter deviation.
[Test Report]
Pass
Bug:
176783467
Test: Measure audio/video latency before and after 7 hours of playback
Change-Id: I6116ca81a223d305128f6c75f262375fed2f90bc
Jack He [Fri, 22 Jan 2021 10:32:11 +0000 (10:32 +0000)]
Merge "[GD ACL] Do the right check by transport when sending ACL data and cmd"
Dmitry Shmidt [Fri, 22 Jan 2021 02:28:55 +0000 (02:28 +0000)]
Merge "bt: Fix acl_ble_is_role_central() removal"
Jack He [Fri, 22 Jan 2021 01:19:33 +0000 (17:19 -0800)]
[GD ACL] Do the right check by transport when sending ACL data and cmd
Bug:
178139545
Fixes:
178139545
Test: pair with LE device
Tag: #gd-refactor
Change-Id: Ib94ab7c1924a43b637ef5049e3dd3938a5291ea2
Joel Galenson [Fri, 22 Jan 2021 01:11:20 +0000 (17:11 -0800)]
Explicitly add static dependencies
Soong does not propagate dependencies through static targets, which
can cause linker errors. Until this is fixed, add the dependencies
explicitly.
Test: Build with and without coverage locally
Test: Will run TreeHugger and Forrest
Change-Id: Icab6568f3cc0783bf2a550ecd15b08f57c0d77b2
Hansong Zhang [Thu, 21 Jan 2021 19:25:38 +0000 (11:25 -0800)]
Fix btm_sco_connected usage
Don't invoke when bda is nullptr.
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: I2509e905849c6b9e224242e2486a8e3496e6314a
Chris Manton [Thu, 21 Jan 2021 20:20:23 +0000 (12:20 -0800)]
gd_acl: Upon le disconnect use proper transport conn map
Bug:
178065202
Test: Compiles
Tag: #refactor
Change-Id: Ifd5e027f707c22faaf07b95434a8daacf43eb30a
Dmitry Shmidt [Thu, 21 Jan 2021 19:38:47 +0000 (11:38 -0800)]
bt: Fix acl_ble_is_role_central() removal
Bug:
178097755
Test: make -j24
Change-Id: I3d77c23fc90d5e12f2d909bba930813cb5d47026
Zach Johnson [Thu, 21 Jan 2021 17:28:17 +0000 (17:28 +0000)]
Merge "Dynamic Audio Buffer (3/3)"
Jakub Pawlowski [Thu, 21 Jan 2021 08:56:46 +0000 (08:56 +0000)]
Merge "gattc: Extend gattc queue with mtu exchange"
Hansong Zhang [Wed, 20 Jan 2021 07:37:49 +0000 (23:37 -0800)]
Re-route LE adv set terminate callback
Don't need to go through L2cap. Directly update it with ACL manager.
Test: cert/run
Test: bluetooth_test_gd
Tag: #gd-refactor
Bug:
141555841
Change-Id: Id303b7bd5ef56b0ef324b7045d1eea0e3eda6e3e
Hansong Zhang [Tue, 19 Jan 2021 22:40:53 +0000 (14:40 -0800)]
L2cap shim: Implement remote features
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: I1e9906d6dc4219648f376b7c4a09e58e593fdae3
Hansong Zhang [Sun, 17 Jan 2021 22:12:09 +0000 (14:12 -0800)]
Use BTM_GetHCIConnHandle
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: I3b56b3d12a67556cd1d4148b1f08042b3dd18a3e
Hansong Zhang [Sun, 17 Jan 2021 22:08:04 +0000 (14:08 -0800)]
Remove acl_get_transport_from_handle
Use BTM_IsBleConnection
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Iac21c9344e2c929cb439433b24bf2ca432feaf73
Hansong Zhang [Wed, 20 Jan 2021 08:12:52 +0000 (00:12 -0800)]
L2cap LE: Read remote version on connection
Needed by SMP
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: I565b107b688788cc720b8531855dc4dd701ad188
Hansong Zhang [Wed, 20 Jan 2021 08:26:13 +0000 (00:26 -0800)]
Simplify code in ble_privacy
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: I53ccefbdc10c159d0905a76b5b021056e8cecab9
Zach Johnson [Wed, 20 Jan 2021 23:03:25 +0000 (23:03 +0000)]
Merge "rusty-gd: fix parted dependency injection"
Zach Johnson [Wed, 20 Jan 2021 20:55:56 +0000 (12:55 -0800)]
rusty-gd: fix parted dependency injection
make sure to await
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I1ef2bd265b77bdae8ff0c60423fedf9a05878262
Hansong Zhang [Sun, 17 Jan 2021 22:01:05 +0000 (14:01 -0800)]
BTM_ReadAutomaticFlushTimeout is unused
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: I6d38dea5c09f64f6156e7e12e9479dccfedbec25
Hansong Zhang [Sun, 17 Jan 2021 21:59:24 +0000 (13:59 -0800)]
read_automatic_flush_timeout is not used
Unused result.
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Ib0de4f22fcffadf5054a72ed3555965682c9633b
Hansong Zhang [Sun, 17 Jan 2021 21:22:51 +0000 (13:22 -0800)]
Always disconnect ACL by handle
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Ib106ff802eccdcde09f9c9a19ef595ddfab1ace2
Hansong Zhang [Sun, 17 Jan 2021 21:08:56 +0000 (13:08 -0800)]
Set ACL disconnect reason in ACL, not L2cap
And combine two identical functions
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Idb883bebc85df8b68270de5f650e2bc7fffcc69e
Hansong Zhang [Sun, 17 Jan 2021 21:04:28 +0000 (13:04 -0800)]
sco_disc_reason is unused
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Ib2417fa61c7a661f4b385f92645868cae270e62d
Hansong Zhang [Sun, 17 Jan 2021 20:50:32 +0000 (12:50 -0800)]
Make link supervision timeout as a constant
It's always 5 seconds.
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: I98326987479e03e71e64d0748aa0e6b15951f12b
Hansong Zhang [Sun, 17 Jan 2021 20:30:02 +0000 (12:30 -0800)]
Simplify get role API
Just use BTM_GetRole()
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Ic90c23afe6512ee45acefdc9d04fca47ad5c550b
Hansong Zhang [Sun, 17 Jan 2021 20:38:33 +0000 (12:38 -0800)]
Move BTM_SetLinkSuperTout from L2cap to ACL
It's link related.
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Iad0f15e4915f0c98d9a0fecb342cf97cfd621bcf
Jack He [Wed, 20 Jan 2021 19:02:28 +0000 (19:02 +0000)]
Merge "GD Controller: Add status packet for LE_READ_REMOTE_FEATURES"
Treehugger Robot [Wed, 20 Jan 2021 19:00:54 +0000 (19:00 +0000)]
Merge changes from topic "gd_l2cap_init_security"
* changes:
Cert: Add InitiateConnectionForSecurity to PyL2cap
Security: Fix pairing handler dispatching
Treehugger Robot [Wed, 20 Jan 2021 18:05:48 +0000 (18:05 +0000)]
Merge changes I43b8a393,I576be190,Iedc4254e,I0420630f,Ic6aa1f96, ...
* changes:
Add stack/include/btm_api_types::io_capabilities_text
Add main/shim/helpers::ToHciRole
Encapsulate tACL_CONN::role_switch
Add API tACL_CONN::is_{disconnect/role_switch}_pending
HACK: Remove SCO disconnect short circuit
Streamline btif/src/btif_hf::HeadsetInterface::PhoneStateChange
btm_history: BTM_CreateSco call connecting
Add stack/btm/btm_sco::GetLegacyHciInterface
Treehugger Robot [Wed, 20 Jan 2021 18:05:32 +0000 (18:05 +0000)]
Merge changes from topic "gd: Pass address of scan result by value"
* changes:
gd: Pass address of scan result by value
gd: Implement Advertising Packet Content Filter
Chris Manton [Fri, 6 Nov 2020 17:09:01 +0000 (09:09 -0800)]
Add stack/include/btm_api_types::io_capabilities_text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I43b8a393929b9d6da042e991c08a9bfac22c557a
Chris Manton [Thu, 31 Dec 2020 00:19:12 +0000 (16:19 -0800)]
Add main/shim/helpers::ToHciRole
Towards shimmable code
Bug:
176960731
Tag: #refactor
Test: gd/cert/run
Change-Id: I576be1908b70116b9aeeaa56c0e1601480ccbcb2
Chris Manton [Sun, 17 Jan 2021 17:11:41 +0000 (09:11 -0800)]
Encapsulate tACL_CONN::role_switch
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Iedc4254e3c8085257c906a5a78754fc366747c44
Chris Manton [Sun, 17 Jan 2021 17:00:18 +0000 (09:00 -0800)]
Add API tACL_CONN::is_{disconnect/role_switch}_pending
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I0420630f45bb16719e669c9f75f929ba46c88c2e
Chris Manton [Sun, 17 Jan 2021 16:58:31 +0000 (08:58 -0800)]
HACK: Remove SCO disconnect short circuit
Bug:
177382279
Tag: #refactor
Test: gd/cert/run
Change-Id: Ic6aa1f96f7f5dafa9287fa4be6f6d4966a9c5e80