OSDN Git Service
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
Chris Manton [Sun, 17 Jan 2021 06:08:32 +0000 (22:08 -0800)]
Streamline btif/src/btif_hf::HeadsetInterface::PhoneStateChange
Towards loggable code
Bug:
177382279
Tag: #refactor
Test: gd/cert/run
Change-Id: I50275f6532c11b8d0212633908483de0d2bc5707
Chris Manton [Sun, 17 Jan 2021 17:51:23 +0000 (09:51 -0800)]
btm_history: BTM_CreateSco call connecting
Towards loggable code
Bug:
177382279
Tag: #refactor
Test: gd/cert/run
Change-Id: I81b64cdcb790a06a57ba792c05d9eac66be2a78e
Chris Manton [Sun, 17 Jan 2021 17:51:11 +0000 (09:51 -0800)]
Add stack/btm/btm_sco::GetLegacyHciInterface
Issue hci disconnect in stack/btm/btm_sco::BTM_RemoveSco
No need to bother the acl layer since it knows nothing
about it anyway.
Bug:
177382279
Tag: #refactor
Test: gd/cert/run
Change-Id: I8704754d0a8737b183e3e5e3892604b209b0aefa
Chris Manton [Sat, 16 Jan 2021 17:33:12 +0000 (09:33 -0800)]
Connect main/shim/acl_legacy_interface::btm_sco_on_disconnected
Bug:
177382279
Tag: #refactor
Test: gd/cert/run
Change-Id: Ib1db9bc167cb467daa7468fa0b41ec7e54701b38
Chris Manton [Sat, 16 Jan 2021 17:33:02 +0000 (09:33 -0800)]
Declare stack/include/sco_hci_link_interface::btm_sco_on_disconnected
Bug:
177382279
Tag: #refactor
Test: gd/cert/run
Change-Id: Ia0f48733b76612d5a14b787491c557d706f4bdd3
Chris Manton [Sat, 16 Jan 2021 17:31:50 +0000 (09:31 -0800)]
De-anonymize stack/include/btm_api_types::tBTM_ESCO_DATA
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I8b0d26cf0fd10ba0cf5c301c20dc4c03edd512f9
Chris Manton [Sat, 16 Jan 2021 02:43:39 +0000 (18:43 -0800)]
gd_shim: Use HACK_SetScoDisconnectCallback
Bug:
177382279
Tag: #refactor
Test: gd/cert/run
Change-Id: I9b5bead73332603a4f9024a8cd5c015008a1102b
Chris Manton [Sat, 16 Jan 2021 06:37:29 +0000 (22:37 -0800)]
Add stack/btm/btm_sco::btm_sco_on_disconnected
Bug:
177382279
Tag: #refactor
Test: gd/cert/run
Change-Id: I29b4a60bbab47a3415c96df7adea3a175bc19848
Chris Manton [Sat, 16 Jan 2021 06:37:23 +0000 (22:37 -0800)]
Add stack/btm/btm_sco::get_index
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I7c78eefd86b16d501e629df6e8b61689eff864ce
Chris Manton [Sat, 16 Jan 2021 06:12:43 +0000 (22:12 -0800)]
Add tSCO_CB::get_sco_connection_from_handle
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I5ee023dbfca4777dbc4f3674efbe3354a97a2561
Chris Manton [Sat, 16 Jan 2021 03:51:07 +0000 (19:51 -0800)]
Add btm Register_HACK_SetScoDisconnectCallback
Towards meaningful code
Bug:
177382279
Tag: #refactor
Test: gd/cert/run
Change-Id: Idd77f86c803825faf5233e768a68c72baee8cdff
Chris Manton [Sat, 16 Jan 2021 00:57:55 +0000 (16:57 -0800)]
Add API tSCO_CONN::is_active,Handle
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I4f99dd54ad056fbb4ef636779cc0d661890c622c
Chris Manton [Sat, 16 Jan 2021 00:52:36 +0000 (16:52 -0800)]
Add tSCO_CONN::get_sco_connection_from_index
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I39a87cb83e6e0572b407f1fccc5a11b11e96ee0e
Chris Manton [Mon, 21 Dec 2020 18:46:35 +0000 (10:46 -0800)]
Use SCO stack/btm/btm_sco::BTM_LogHistory
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Iede79a345994d2249a3532b2cd790b66f07ef0b5
Chris Manton [Fri, 15 Jan 2021 06:40:15 +0000 (22:40 -0800)]
Use main/shim/dumpsys::PRIVATE_CELL
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I89f8a2b8433dfd3236cdac8e957fd6dd05b60b34
Chris Manton [Fri, 15 Jan 2021 06:40:00 +0000 (22:40 -0800)]
Add main/shim/dumpsys::PRIVATE_CELL
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I2cf0c872880e8a0cf8bfd5c598852badd29884ce
Chris Manton [Fri, 15 Jan 2021 05:36:22 +0000 (21:36 -0800)]
Re-log btif/src/btif_gatt_util::btif_gatt_check_encrypted_link
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I86b8c7ebd1ce531711d3bff6752800fe2e714ddb
Chris Manton [Thu, 14 Jan 2021 22:04:09 +0000 (14:04 -0800)]
Add APIs stack/btm/security_device_record::
get_br_edr_hci_handle,Handle
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I820541c1f2fc86202710b7ef1bb5756ca9427851
Chris Manton [Sun, 10 Jan 2021 18:45:58 +0000 (10:45 -0800)]
Remove unnecessary stack/acl/btm_acl::btm_pm_is_le_link
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ic5569a10bad4de55ccba1821e0433ef053b033ad
Chris Manton [Tue, 22 Dec 2020 00:43:12 +0000 (16:43 -0800)]
Unfriend stack/acl/acl::tACL_CB
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I3a0f02798512570b6f4dbad16ea677fc40b00a51
Chris Manton [Fri, 1 Jan 2021 17:24:02 +0000 (09:24 -0800)]
Remove unused stack/include/acl_api_types::tBTM_QOS_SETUP_CMPL
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I7508663f27daf10d965ff4681846234ffad6cd6b
Chris Manton [Fri, 1 Jan 2021 17:09:52 +0000 (09:09 -0800)]
Remove unused stack/include/acl_api_types::tBTM_INQ_TXPWR_RESULT
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I0ae500ee283d1e5c46632bf940f8b547bdafbb13
Chris Manton [Thu, 3 Dec 2020 17:53:53 +0000 (09:53 -0800)]
Re-log stack/avct/avct_lcb_act::avct_lcb_chk_disc
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Id9bf35ae2128758ea7b6fc8842c9a60b1cafaf5e
Chris Manton [Sun, 17 Jan 2021 19:13:12 +0000 (11:13 -0800)]
Remove unnecessary external tBTM_CB::Inits
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I22a8a48535e6059fe6e6610d4430635eaf545416
Chris Manton [Sun, 17 Jan 2021 19:12:08 +0000 (11:12 -0800)]
Pull various Inits into parent tBTM_CB::Init structure
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I7be4efb156e1f84904f69b38763f6527e9764f23
Chris Manton [Sun, 10 Jan 2021 03:25:44 +0000 (19:25 -0800)]
Remove stack/btm/btm_int.h
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ie392fb94d7c2c49e51e6c6256aea628ae6eab5ec
Chris Manton [Sat, 9 Jan 2021 23:03:07 +0000 (15:03 -0800)]
Use get_btm_client_interface().peer.BTM_GetMaxPacketSize
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I1103dd86d508fc4cf937afd4a2338586528acde1
Chris Manton [Sun, 10 Jan 2021 02:20:32 +0000 (18:20 -0800)]
Use btm_cb.devcb.Init
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ic8fa0c8888e0252edd8081d547ae6189610f9926
Chris Manton [Sat, 9 Jan 2021 23:13:55 +0000 (15:13 -0800)]
Remove unused fields tBTM_CFG::
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I949f26268baabe191ab2e09c4e67e8ec20de10ce
Chris Manton [Sat, 9 Jan 2021 23:00:05 +0000 (15:00 -0800)]
Internalize btm_acl_device_down::BTM_db_reset
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I4ac186ac095ee1402d8ac60b5a7a7a142fc02bdc
Chris Manton [Sat, 9 Jan 2021 22:52:40 +0000 (14:52 -0800)]
Add tBTM_INQUIRY_VAR_ST::Init/Free
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ib11110dcd4e93f0b315441b322e06afbc082615e
Chris Manton [Sat, 9 Jan 2021 22:40:56 +0000 (14:40 -0800)]
Move sco packet types to sco initialization
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ief025f785d33f281768b23f7d4ea8b98f961f573
Hansong Zhang [Tue, 19 Jan 2021 22:55:06 +0000 (14:55 -0800)]
Add boilerplate code for 5.2 COC
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Ia684f65765fdfa134657e2e2ee5640fa1813b708
Treehugger Robot [Wed, 20 Jan 2021 05:55:12 +0000 (05:55 +0000)]
Merge changes Ia3f3c5d7,If3aaeccc,I74915b3a,I49b167a3,Iab536745
* changes:
Include rfcdefs and add btm_client_interface
Add tBTM_DEVCB::Init/Free
Add tSCO_CB::Init
Remove useless global level of indirection
Add and Use stack//btm_acl::internal::set_default_packet_types_supported
Treehugger Robot [Wed, 20 Jan 2021 03:09:40 +0000 (03:09 +0000)]
Merge changes I5a31f506,If496d946
* changes:
Consolidate assignment btm_cb.acl_cb_.btm_acl_pkt_types_supported
Add param BTM_acl_after_controller_started::controller_t
Zach Johnson [Wed, 20 Jan 2021 03:00:52 +0000 (03:00 +0000)]
Merge changes I3a54a514,Iada70c9f,I1fb728ce,I181f0d77,I1df3c852, ...
* changes:
rusty-gd: migrate classic acl to a directory, in prep for facade
rusty-gd: some tidying in acl
rusty-gd: add authentication complete for classic acl
rusty-gd: implement connection request for classic ACL
rusty-gd: wire through classic ACL API for disconnect
rusty-gd: expose core byte rx/tx for classic ACL
rusty-gd: move acl core from lib.rs to core.rs
rusty-gd: implement connection complete for classic acl
rusty-gd: simplify acl internal requests by using structured enums
rusty-gd: start classic acl manager
rusty-gd: report acl disconnections
rusty-gd: implement ACL connection close
rusty-gd: add ACL credit control
rusty-gd: implement outbound fragmentation & dispatch
rusty-gd: add packet reassembler
rusty-gd: implement vector payloads for packets
rusty-gd: start ACL - simple dispatch of inbound traffic
Chris Manton [Sun, 17 Jan 2021 22:16:01 +0000 (14:16 -0800)]
Include rfcdefs and add btm_client_interface
Towards including what you use
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ia3f3c5d7d803a39272727f2a3a9a93febd0efad9
Chris Manton [Sat, 9 Jan 2021 22:11:24 +0000 (14:11 -0800)]
Consolidate assignment btm_cb.acl_cb_.btm_acl_pkt_types_supported
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I5a31f506d1dcabc4446aaf8033db4b2159a65705
Chris Manton [Sat, 9 Jan 2021 22:40:37 +0000 (14:40 -0800)]
Add tBTM_DEVCB::Init/Free
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: If3aaeccc0ea876d9d9f5ca87893035cb222b789e
Chris Manton [Sat, 9 Jan 2021 21:32:06 +0000 (13:32 -0800)]
Add param BTM_acl_after_controller_started::controller_t
Towards injectable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: If496d94615ebca3e459f9b2dbe6b114710258d7a
Chris Manton [Sat, 9 Jan 2021 22:32:08 +0000 (14:32 -0800)]
Add tSCO_CB::Init
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I74915b3a39423483206297df7e04a6572fd5ba51
Chris Manton [Sat, 9 Jan 2021 22:29:00 +0000 (14:29 -0800)]
Remove useless global level of indirection
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I49b167a33a7733d5abf3a290a45f63e801b7401d
Chris Manton [Sat, 9 Jan 2021 22:14:52 +0000 (14:14 -0800)]
Add and Use stack//btm_acl::internal::set_default_packet_types_supported
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Iab53674505ab691565b7b83a282aa28c76454614
Treehugger Robot [Wed, 20 Jan 2021 02:45:05 +0000 (02:45 +0000)]
Merge "gd: Update random address when command success"
Treehugger Robot [Wed, 20 Jan 2021 02:39:09 +0000 (02:39 +0000)]
Merge changes Icba988d3,Ia8874c80,I36da3481,Ica4914f5
* changes:
Add test SetSupervisorTimeoutOnConnectionSuccess
Fully encapsulate tBTM_SEC_DEV_REC::is_originator
Use tBTM_SEC_DEV_REC::IsLocallyInitiated
Add API tBTM_SEC_DEV_REC::IsLocallyInitiated
Treehugger Robot [Wed, 20 Jan 2021 01:44:29 +0000 (01:44 +0000)]
Merge "gd: Handle scan parameter"
Treehugger Robot [Wed, 20 Jan 2021 01:35:30 +0000 (01:35 +0000)]
Merge "gd: Fix bug of AdvertisingCache"
Zach Johnson [Thu, 31 Dec 2020 18:27:14 +0000 (10:27 -0800)]
rusty-gd: migrate classic acl to a directory, in prep for facade
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I3a54a514a36b0071585536888f791f29f22f015c
Zach Johnson [Thu, 31 Dec 2020 03:06:18 +0000 (19:06 -0800)]
rusty-gd: some tidying in acl
use short variable names where the usage context is so small it's self
explanatory (a little more go-like)
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Iada70c9f33d141e93828c14dcad31057195027bb
Zach Johnson [Thu, 31 Dec 2020 01:42:24 +0000 (17:42 -0800)]
rusty-gd: add authentication complete for classic acl
also, use common event packet-for-connection forwarnding mechanism
between core and classic
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I1fb728ceebe445bc36c2a368bd72a27284332177
Zach Johnson [Thu, 31 Dec 2020 01:14:15 +0000 (17:14 -0800)]
rusty-gd: implement connection request for classic ACL
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I181f0d77851cd7005ec7def57b019a7dd0ae150b
Zach Johnson [Thu, 31 Dec 2020 01:00:04 +0000 (17:00 -0800)]
rusty-gd: wire through classic ACL API for disconnect
also, since we are unregistering implicitly upon disconnect, no need to
expose that in the core
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I1df3c852ecda68977c89aaa0377189cc7a746c27
Zach Johnson [Thu, 31 Dec 2020 00:00:04 +0000 (16:00 -0800)]
rusty-gd: expose core byte rx/tx for classic ACL
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I6491a9468198f9433248c852c70947aaa1f9091a
Zach Johnson [Wed, 30 Dec 2020 22:48:28 +0000 (14:48 -0800)]
rusty-gd: move acl core from lib.rs to core.rs
this allows internals to stay internal
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ifc9af8a5403804a5cf15b39abf979c1dc570c7bc
Zach Johnson [Wed, 30 Dec 2020 22:40:07 +0000 (14:40 -0800)]
rusty-gd: implement connection complete for classic acl
still not hooked up into the core dispatch yet, coming soon
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I32c487719ab55cfb6996a308e4c3998a08c5a078
Zach Johnson [Wed, 30 Dec 2020 18:52:11 +0000 (10:52 -0800)]
rusty-gd: simplify acl internal requests by using structured enums
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: If761b4020cc7dfc288c48ab3ab43204b5ef93958
Zach Johnson [Wed, 30 Dec 2020 18:44:31 +0000 (10:44 -0800)]
rusty-gd: start classic acl manager
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ieeaff245a4f19f39311d4ce779576760c6a9f14a
Zach Johnson [Wed, 30 Dec 2020 03:25:46 +0000 (19:25 -0800)]
rusty-gd: report acl disconnections
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ia202284ea8a7267c0307ae9290f10154dbd3c353
Zach Johnson [Wed, 30 Dec 2020 02:07:52 +0000 (18:07 -0800)]
rusty-gd: implement ACL connection close
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Iaf9770676077aa5e9bfb3f2ff49545d9b71c282f
Zach Johnson [Wed, 30 Dec 2020 01:36:58 +0000 (17:36 -0800)]
rusty-gd: add ACL credit control
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ic85c5c81947482bebb23d52f19609ec4f3227987
Zach Johnson [Tue, 29 Dec 2020 21:55:12 +0000 (13:55 -0800)]
rusty-gd: implement outbound fragmentation & dispatch
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I122e9b5e84be2164685f14c0efe48765c752c094
Zach Johnson [Mon, 28 Dec 2020 22:52:36 +0000 (14:52 -0800)]
rusty-gd: add packet reassembler
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ifdf4565dfe9c207f84b6b8d2a6f830509c243b08
Zach Johnson [Mon, 28 Dec 2020 20:50:45 +0000 (12:50 -0800)]
rusty-gd: implement vector payloads for packets
this way, we can get the contents to pass to higher layers from ACL, etc
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ib18512d2dcafa9f8624e19a506634b8f92d1e170
Zach Johnson [Mon, 28 Dec 2020 19:43:02 +0000 (11:43 -0800)]
rusty-gd: start ACL - simple dispatch of inbound traffic
does not do reassembly or anything like that yet
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I3844b86f035dface8fc1d54eb3f426ad2d40000c
Chris Manton [Mon, 11 Jan 2021 06:07:07 +0000 (22:07 -0800)]
Add test SetSupervisorTimeoutOnConnectionSuccess
Towards testable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Icba988d39df5f3210b5e97e3da2dbbca98a12cd4
Chris Manton [Mon, 11 Jan 2021 06:30:02 +0000 (22:30 -0800)]
Re-log stack/acl/btm_acl::btm_acl_created
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I1e6ffe540d913839577c6a7969ddf2d073b83332
Chris Manton [Mon, 11 Jan 2021 06:06:47 +0000 (22:06 -0800)]
Fully encapsulate tBTM_SEC_DEV_REC::is_originator
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ia8874c80ceedeb6e331dfbff48e3fc9ddee6cc87
Chris Manton [Mon, 11 Jan 2021 05:53:48 +0000 (21:53 -0800)]
Re-log stack/btm/btm_sec::btm_sec_connected
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I0d613230cdc7a0701aa848effa129cc4b8c58b4b
Chris Manton [Mon, 11 Jan 2021 06:06:29 +0000 (22:06 -0800)]
Use tBTM_SEC_DEV_REC::IsLocallyInitiated
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I36da3481eb54ce016df021fa6d24f3f82555ace8
Chris Manton [Mon, 11 Jan 2021 06:09:38 +0000 (22:09 -0800)]
Add API tBTM_SEC_DEV_REC::IsLocallyInitiated
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ica4914f5030667594f926892f6c7794d87bd6aee
Chris Manton [Mon, 11 Jan 2021 06:51:33 +0000 (22:51 -0800)]
Use stack/acl/btm_acl::hci_btm_set_link_supervision_timeout
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I5fa26134ddd5485d940d7f18a7d26bbd27959a31
Chris Manton [Mon, 11 Jan 2021 03:37:13 +0000 (19:37 -0800)]
Add stack/acl/btm_acl::hci_btm_set_link_supervision_timeout
Towards modular and testable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ib940a203a5bfa2293d0c95741071364a01aa5967
Chris Manton [Sun, 10 Jan 2021 23:39:36 +0000 (15:39 -0800)]
Test stack/acl/btm_acl::on_acl_br_edr_{success,failed}
Try not to re-converge divergent code paths
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic8a795369972bb38e5ab9bb51c9e735c382680e4
Chris Manton [Sun, 10 Jan 2021 23:31:15 +0000 (15:31 -0800)]
gd_shim_acl: Plumb stack/acl/btm_acl::on_acl_br_edr_{success,failed}
Try not to re-converge divergent code paths
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie78d6b8c8d4eca1a24175a07f4e775e92439ce1b
Chris Manton [Sun, 10 Jan 2021 22:51:01 +0000 (14:51 -0800)]
Use stack/acl/btm_acl::on_acl_br_edr_{success,failed}
Try not to re-converge divergent code paths
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9f3abe06f0ee276af583fbcb715f198710f48fec
Chris Manton [Sun, 10 Jan 2021 22:48:35 +0000 (14:48 -0800)]
Add stack/acl/btm_acl::on_acl_br_edr_{success,failed}
Try not to re-converge divergent code paths
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib11b50c696c162b9c0aea59c6d92ccf711619808
Chris Manton [Mon, 11 Jan 2021 05:51:40 +0000 (21:51 -0800)]
De-anonymize tBTM_SEC_DEV_REC
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I4f49a92b5fbd227b537899e130291394c130cb9f
Chris Manton [Sun, 17 Jan 2021 17:17:24 +0000 (09:17 -0800)]
Internalize stack/acl/btm_acl::hci_start_role_switch_to_central
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I00d0111acf7e36a2288a6f8975cad9253bd340a0
Chienyuan [Fri, 15 Jan 2021 09:23:40 +0000 (17:23 +0800)]
gd: Handle scan parameter
Tag: #gd-refactor
Bug:
177044452
Test: gd/cert/run
Change-Id: Icb9638b8f852350c36010df89d29a2dd224dc89d
Hansong Zhang [Sun, 17 Jan 2021 09:08:05 +0000 (01:08 -0800)]
Use some L2cap APIs in btm_sec
When we need to start encryption or handle encryption change, link must
be up and L2cap must be already connected.
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Ifd787141ac3669c377b54bf58f9b53776764d61f
Hansong Zhang [Sat, 16 Jan 2021 00:31:19 +0000 (16:31 -0800)]
Simplify some L2cap code
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: I0e9f3164892f91231391e58f3b7a97bca9a47b7e
Chienyuan [Tue, 19 Jan 2021 13:43:10 +0000 (21:43 +0800)]
gd: Update random address when command success
Tag: #gd-refactor
Bug:
152348535
Test: gd/cert/run --host
Change-Id: I8a457cd5f1633a4c75babb14529a7c9f7ecebac6
Chienyuan [Fri, 15 Jan 2021 05:57:49 +0000 (13:57 +0800)]
gd: Fix bug of AdvertisingCache
Tag: #gd-refactor
Bug:
177044452
Test: gd/cert/run --host
Change-Id: Ib7052061335e6eb9eed13c74272f6f80c1550d97
Treehugger Robot [Mon, 18 Jan 2021 11:30:20 +0000 (11:30 +0000)]
Merge "gd: Implement address rotation for advertising set"
Treehugger Robot [Mon, 18 Jan 2021 02:56:19 +0000 (02:56 +0000)]
Merge "Add ISO type support on btsnooz.py script"
Alice Kuo [Fri, 15 Jan 2021 03:39:52 +0000 (11:39 +0800)]
Add ISO type support on btsnooz.py script
Support to decode the ISO packet from the compressed btsnoop in
bugreport.
Bug:
150670922
Bug:
177616528
Test: btsnooz.py bugreport-*.txt which contain ISO traffic.
Tag: #feature
Change-Id: I070ec3023ed2ef65c3d1fce90dcfe2b9d695a89f
Hansong Zhang [Fri, 15 Jan 2021 19:48:17 +0000 (11:48 -0800)]
Fix linter
Test: bluetooth_test_gd
Tag: #gd-refactor
Bug:
141555841
Change-Id: Icbf6ddfd077988ba1feb6646c6909ee1a91e50c6
Sal Savage [Fri, 15 Jan 2021 19:59:49 +0000 (19:59 +0000)]
Merge changes from topic "avrcp-target-cover-art"
* changes:
Add tests for the AVRCP Target Cover Art feature
Pass BIP client status down and use it to decide to send image handles
Add a path to add the PSM of the BIP OBEX server to the SDP record
Allow NewAvrcp to manage its own SDP record
Hansong Zhang [Fri, 15 Jan 2021 06:34:05 +0000 (22:34 -0800)]
RoundRobinScheduler: Add multi priority support
And add SetAclTxPriority() API in AclManager and shim
Test: cert/run
Test: bluetooth_test_gd
Tag: #gd-refactor
Bug:
141555841
Change-Id: I6d5911dfea23b7e7440738c0c4d51a3e3ffbf52f
Hansong Zhang [Fri, 15 Jan 2021 02:56:02 +0000 (18:56 -0800)]
Wire up SetChannelTxPriority
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Iceb6559d7468a886d3720038f172dce6297016d3
Hansong Zhang [Fri, 15 Jan 2021 01:55:26 +0000 (17:55 -0800)]
L2cap scheduler: Implement high priority channel
Add a high priority queue for these channels in scheduler.
Introduce MockQueue to help test with BidiQueueEnd callbacks.
Test: cert/run
Test: bluetooth_test_gd
Tag: #gd-refactor
Bug:
141555841
Change-Id: I3b60002f0d2ac2fb4d3307717dce128ccb06247c
Hansong Zhang [Fri, 15 Jan 2021 05:58:27 +0000 (21:58 -0800)]
Introduce MultiPriorityQueue
ACL and L2cap needs to prioritize some link/channels in some cases. A
traditional priority queue requires predefined comparison, which can be
hard for our use case (PacketBuilder). Instead, we specify the priority
value when we push to a queue.
Test: bluetooth_test_gd
Tag: #gd-refactor
Bug:
141555841
Change-Id: I33414b4bf81e9f63c88d8627376b565f5c5bb6de
Hansong Zhang [Thu, 14 Jan 2021 21:00:45 +0000 (13:00 -0800)]
Refactor L2CA_SetFixedChannelTout
It's always used by LE GATT, so let's change it to
L2CA_SetLeGattTimeout.
Test: cert/run
Tag: #gd-refactor
Bug:
141555841
Change-Id: Ib838426e2fb75a130d7f3d4cfc6f3d32f3e58423
Zach Johnson [Fri, 15 Jan 2021 15:58:33 +0000 (15:58 +0000)]
Merge changes Ia401bcf0,I724939c1,I606f4aff,I548ee2ad,Iee6c37a7, ...
* changes:
rusty-gd: update hal facade
rusty-gd: introduce RxAdapter
rusty-gd: switch hci facade to grpc context
rusty-gd: shim & facade are very similar, start sharing code
rusty-gd: split HAL into control & acl
rusty-gd: allow parting out injected values
Chienyuan [Thu, 14 Jan 2021 13:47:03 +0000 (21:47 +0800)]
gd: Implement address rotation for advertising set
Tag: #gd-refactor
Bug:
149221472
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: If9870dc667c59228edc258998ad9dc183b89dba1
Treehugger Robot [Fri, 15 Jan 2021 03:25:46 +0000 (03:25 +0000)]
Merge "RootCanal: Check PIN on both sides"
Myles Watson [Fri, 15 Jan 2021 01:27:27 +0000 (17:27 -0800)]
RootCanal: Check PIN on both sides
Bug:
148864229
Tag: #gd-refactor
Test: cert/run
Change-Id: I54801c552afe6cc1068c9104836fbe4a211d566c
Treehugger Robot [Thu, 14 Jan 2021 23:45:21 +0000 (23:45 +0000)]
Merge "Fix v2 format decoding in btsnooz.py"
Zach Johnson [Thu, 14 Jan 2021 20:02:52 +0000 (20:02 +0000)]
Merge changes I5d0c9f45,I847253d5,I05ec50c5,I4d55a4b3
* changes:
rusty-gd: simplify exported types
rusty-gd: implement controller shim
rusty-gd: back message loop thread with rust, if rust enabled
don't expose main thread message loop