OSDN Git Service
Chris Manton [Thu, 10 Dec 2020 04:26:48 +0000 (20:26 -0800)]
Use power_mode_state_text in dumpsys
Towards dumpable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I3388cd5cbeccfa28cc0f88d491e83751dad524f0
Chris Manton [Thu, 10 Dec 2020 00:54:52 +0000 (16:54 -0800)]
Add stack/include/btm_api_types::power_mode_text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I18da64eab0ff3e30a8aa7554c6469ae25b9beb07
Chris Manton [Sat, 12 Dec 2020 17:28:05 +0000 (09:28 -0800)]
Use proper acl transport check
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I32c2f381dd49c9683217d2c40abe5146b4bd9ad8
Chris Manton [Sun, 20 Dec 2020 01:22:49 +0000 (17:22 -0800)]
gd_acl: SCO temporary fix
Assume unknown disconnects are from SCO and
respond accordingly
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Icce62bdc05f4e7ba17b1a05ca40b0db42d8e5cc8
Chris Manton [Sat, 19 Dec 2020 18:59:11 +0000 (10:59 -0800)]
Move power_mode registration from btm_cb into acl
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Iaaf7632753f030c70275631da754711759ff822a
Chris Manton [Sat, 19 Dec 2020 16:50:58 +0000 (08:50 -0800)]
Add context term for StackAclBtmPm::btm_pm_snd_md_req
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: If1d4d1809c987dcd01397c5d77ae416d8b8b685f
Chris Manton [Sat, 19 Dec 2020 19:17:14 +0000 (11:17 -0800)]
Move stack/acl/acl::tBTM_PM_STATE earlier in header
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I91ea973bc27328cbbe8bcc1a9e432399da07a366
Chris Manton [Sat, 19 Dec 2020 19:13:12 +0000 (11:13 -0800)]
Move tACL_CB::tBTM_PM_MCB definition before tACL_CONN
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I544f44c343a15f8737d4da8c34444aa3b10c0291
Chris Manton [Sat, 19 Dec 2020 17:13:28 +0000 (09:13 -0800)]
Add stack/acl/btm_acl::acl_get_connection_from_handle
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I9042c6b548c98c038dea817d51a6bd9c891ae758
Zach Johnson [Sat, 19 Dec 2020 19:38:01 +0000 (19:38 +0000)]
Merge changes I1d3569da,Ic6d95ccc,I999c43fd,Ie68b9124,I91e6a21f, ...
* changes:
rusty-gd: more controller
rusty-gd: controller supported commands & le buffer sizes
rusty-gd: A bit more controller
rusty-gd: add intos for builders, so we can skip the formal build call
rusty-gd: start controller module
rusty-gd: simplify queued & pending commands
rusty-gd: make scalar getters return by copy rather than ref
rusty-gd: drastically simplify command sending
rusty-gd: improve ergonomics of sending commands a bit
Zach Johnson [Sat, 19 Dec 2020 02:45:57 +0000 (02:45 +0000)]
Merge changes Iaca9bcda,I3094c7a6,I5d79687e
* changes:
rusty-gd: send reset command when HCI starts
rusty-gd: no more sleep
rusty-gd: protect protected events in hci
Zach Johnson [Sat, 19 Dec 2020 02:44:10 +0000 (02:44 +0000)]
Merge changes I6a0f12b6,I40942038,I4ce65e27
* changes:
rusty-gd: only allow one registration for an event, allow unregistering
rusty-gd: drop events dropped by cpp-gd
rusty-gd: implement le meta events
Zach Johnson [Fri, 18 Dec 2020 21:47:07 +0000 (21:47 +0000)]
Merge changes Ie08faff0,I0356c210,Ie591460e,I51b88fc9
* changes:
rusty-gd: update command sending to match cpp-gd
rusty-gd: simplify hci a little bit
rusty-gd: simplify some packet usages
rusty-gd: improve ergonomics of converting packets to vectors
Zach Johnson [Mon, 14 Dec 2020 04:55:11 +0000 (20:55 -0800)]
rusty-gd: more controller
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I1d3569dadac6411be16c1cf94f3ce6c031846920
Zach Johnson [Mon, 14 Dec 2020 03:54:51 +0000 (19:54 -0800)]
rusty-gd: controller supported commands & le buffer sizes
also, generate TryFrom for OpCodeIndex from OpCode, to remove 700+ lines
of repeated code in C++ gd controller
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ic6d95ccc87a0ccc64636f16b0ef379c1f0d2f069
Zach Johnson [Mon, 14 Dec 2020 01:14:27 +0000 (17:14 -0800)]
rusty-gd: A bit more controller
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I999c43fdbb5bcbcbb005dece73192ec2300138d0
Zach Johnson [Sun, 13 Dec 2020 11:22:22 +0000 (03:22 -0800)]
rusty-gd: add intos for builders, so we can skip the formal build call
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ie68b9124b0d6f7b4c52ce882a6966995088d17f6
Zach Johnson [Sun, 13 Dec 2020 11:09:15 +0000 (03:09 -0800)]
rusty-gd: start controller module
only a few calls to start, more to come
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I91e6a21f4d15e67c5ad7b917cd31d419bf86ebe9
Zach Johnson [Sun, 13 Dec 2020 10:31:53 +0000 (02:31 -0800)]
rusty-gd: simplify queued & pending commands
since packets are just wrappers around Arcs, copies are somewhat cheap
so no need to keep a struct with just opcode anymore
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I6294a728e07b2ee949ef96465b07678845f5115c
Zach Johnson [Sun, 13 Dec 2020 10:17:22 +0000 (02:17 -0800)]
rusty-gd: make scalar getters return by copy rather than ref
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I1427e8cc8c252a1eddb68470b1df215cf53c628f
Zach Johnson [Sun, 13 Dec 2020 09:59:43 +0000 (01:59 -0800)]
rusty-gd: drastically simplify command sending
include a trait during generation that knows how to
convert the event responses to the correct matching type
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Icf96ce20c0b2311e94e5198c1cc4038f78683771
Zach Johnson [Sun, 13 Dec 2020 08:18:03 +0000 (00:18 -0800)]
rusty-gd: send reset command when HCI starts
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Iaca9bcda285ff4682532efeb43e2892adc487e9a
Zach Johnson [Sun, 13 Dec 2020 07:03:50 +0000 (23:03 -0800)]
rusty-gd: only allow one registration for an event, allow unregistering
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I6a0f12b696a22f0653037e3530ccfb4e2f38d001
Zach Johnson [Sun, 13 Dec 2020 06:14:56 +0000 (22:14 -0800)]
rusty-gd: update command sending to match cpp-gd
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ie08faff009045ee329c7392652d632fed49f9d11
Zach Johnson [Sun, 13 Dec 2020 08:22:14 +0000 (00:22 -0800)]
rusty-gd: improve ergonomics of sending commands a bit
use generics to implicity call into
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ied9f2e4f544979f63554bd3276e092788e0f0706
Zach Johnson [Sun, 13 Dec 2020 07:51:13 +0000 (23:51 -0800)]
rusty-gd: no more sleep
since it's backed by a fd, a structure that encourages reuse is a good
thing.
integrate this into HCI, for command timeouts
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I3094c7a666281cebdfdeee05246ac1ad557988c5
Zach Johnson [Sun, 13 Dec 2020 06:54:17 +0000 (22:54 -0800)]
rusty-gd: drop events dropped by cpp-gd
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I40942038dea359a31f413f604dcc3c6db926f80e
Zach Johnson [Sun, 13 Dec 2020 05:38:53 +0000 (21:38 -0800)]
rusty-gd: simplify hci a little bit
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I0356c2102cf760c091a92ae0ab8ee7917eea03b6
Zach Johnson [Sun, 13 Dec 2020 07:16:12 +0000 (23:16 -0800)]
rusty-gd: protect protected events in hci
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I5d79687eb4d464fb5942651f86945db31cfa62d3
Zach Johnson [Sun, 13 Dec 2020 06:45:46 +0000 (22:45 -0800)]
rusty-gd: implement le meta events
and oh hey, pattern matching is pretty freaking great
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I4ce65e275ffe0e16161260e854d02987d166e4ca
Zach Johnson [Sun, 13 Dec 2020 05:13:52 +0000 (21:13 -0800)]
rusty-gd: simplify some packet usages
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ie591460ed642a46215cfe8b0ddefcb509f21db89
Zach Johnson [Sun, 13 Dec 2020 05:02:59 +0000 (21:02 -0800)]
rusty-gd: improve ergonomics of converting packets to vectors
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I51b88fc9513475ab0e25b41ce5bb40b7934e9692
Zach Johnson [Fri, 18 Dec 2020 01:31:42 +0000 (01:31 +0000)]
Merge "rusty-gd: integrate rusty packets into existing code"
Treehugger Robot [Thu, 17 Dec 2020 20:37:07 +0000 (20:37 +0000)]
Merge changes I65399f4e,Iad27b185,Ia43609b6,I78a06be7,I8e518f2b, ...
* changes:
Properly retrieve acl_conn stack/acl/btm_acl::btm_pm_proc_mode_change
Re-log stack/acl/btm_pm::BTM_SetPowerMode
Re-log bta/dm/bta_dm_pm::bta_dm_pm_cback
Introduce bluetooth::legacy::hci::Interface
gd_acl: Add bluetooth::shim::ACL_Disconnect
gd_acl: Add shim disconnect
gd_acl: Add main/shim/helpers::ToDisconnectReasonFromLegacy
Remove unnecessary stack/acl/btm_acl::l2c_link_hci_conn_comp
Add stack/btm/btm_main::BTM_LogHistory
Properly retrieve acl_conn stack/acl/btm_acl::btm_acl_encrypt_change
Properly retrieve acl_conn stack/acl/btm_acl::btm_acl_process_sca_cmpl_pkt
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_failed_contact_counter_complete
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_link_quality_complete
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_remote_ext_features_failed
gd_acl: Add sniff_subrating to dumpsys
Add stack/acl/btm_pm::StackAclBtmPm::btm_pm_get_power_manager_from_handle
Add stack/acl/btm_acl::acl_disconnect_from_handle
Add stack/acl/btm_acl::hci_btsnd_hcic_disconnect
Add tBTA_DM_SSR_SPEC.name[] field for sniff subrating options
Add bta/dm/bta_dm_int::device_info_text
Zach Johnson [Sun, 13 Dec 2020 04:11:26 +0000 (20:11 -0800)]
rusty-gd: integrate rusty packets into existing code
still gotta wait for parsing to land for this to officially work, but
this allows us to play with the ergonomics independently based on what
compiles..
next CLs will start to improve the ergos.
some ergos improved this CL.
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I5eadd7619c5d392c2dd03331c5d604d9a52a1687
Zach Johnson [Thu, 17 Dec 2020 19:26:20 +0000 (19:26 +0000)]
Merge "use common data + payload for hci & hal facades"
Zach Johnson [Thu, 17 Dec 2020 19:22:18 +0000 (19:22 +0000)]
Merge "rusty-gd: create singular proto facade lib"
Treehugger Robot [Thu, 17 Dec 2020 17:38:26 +0000 (17:38 +0000)]
Merge "gd: Default to rotating addresses"
Chris Manton [Sun, 13 Dec 2020 19:22:34 +0000 (11:22 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_pm_proc_mode_change
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I65399f4e4bc108c19e1e52dcd719f050f7479caa
Chris Manton [Wed, 9 Dec 2020 05:55:52 +0000 (21:55 -0800)]
Re-log stack/acl/btm_pm::BTM_SetPowerMode
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Iad27b18551957854ae1c8a0b962492abf7e53e10
Chris Manton [Wed, 9 Dec 2020 05:55:38 +0000 (21:55 -0800)]
Re-log bta/dm/bta_dm_pm::bta_dm_pm_cback
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ia43609b6e9bf52d156e8770cb8bde903d7cb1ed7
Chris Manton [Wed, 16 Dec 2020 20:19:58 +0000 (12:19 -0800)]
Introduce bluetooth::legacy::hci::Interface
Migrate away from globals which allow any module
anywhere to bypass design intent which may
potentially introduce unintended code paths and
possible instability in module relationships.
Also towards testable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I78a06be73906973e0bbdaba78cc7fbf27d9b27cb
Chris Manton [Wed, 16 Dec 2020 17:42:43 +0000 (09:42 -0800)]
gd_acl: Add bluetooth::shim::ACL_Disconnect
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I8e518f2bd768889874814950cd08be6e193aa0a1
Chris Manton [Wed, 16 Dec 2020 17:43:19 +0000 (09:43 -0800)]
gd_acl: Add shim disconnect
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I8bf1358024ab61c5ed8377424c52e9aa219a75d5
Chris Manton [Wed, 16 Dec 2020 17:42:28 +0000 (09:42 -0800)]
gd_acl: Add main/shim/helpers::ToDisconnectReasonFromLegacy
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ic3229da912e823fc16bda0e377d0b8f08db0d730
Chris Manton [Tue, 15 Dec 2020 22:55:16 +0000 (14:55 -0800)]
Remove unnecessary stack/acl/btm_acl::l2c_link_hci_conn_comp
No longer part of the hci_l2c interface
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Icd5170cef3883c047b44ae9932a26654b6a807b2
Chris Manton [Mon, 14 Dec 2020 02:58:42 +0000 (18:58 -0800)]
Add stack/btm/btm_main::BTM_LogHistory
Expand to allow any module to partake
Towards dumpable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I3e587c191e93ba0cbee96a2e0f9cb4c6514033ca
Chris Manton [Sun, 13 Dec 2020 19:42:31 +0000 (11:42 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_acl_encrypt_change
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I256932b85550c1c005c54879002f19ad10e25d3d
Chris Manton [Sun, 13 Dec 2020 19:36:50 +0000 (11:36 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_acl_process_sca_cmpl_pkt
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I26b5e537e3a99ee689d43314115e5fb8ebb0cc55
Chris Manton [Sun, 13 Dec 2020 19:14:03 +0000 (11:14 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_failed_contact_counter_complete
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I8391353a58a57c0f5d57e80e14ca0c122f30a1dc
Chris Manton [Sun, 13 Dec 2020 19:07:22 +0000 (11:07 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_link_quality_complete
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I793fe1ba943c2c413d3f443e54448de565c6528a
Chris Manton [Sun, 13 Dec 2020 19:00:46 +0000 (11:00 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_remote_ext_features_failed
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I4a55d44689dc07cb7e6a0c926f7b8f9295205d97
Chris Manton [Wed, 9 Dec 2020 16:52:11 +0000 (08:52 -0800)]
gd_acl: Add sniff_subrating to dumpsys
Towards dumpable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I8ce22843841aa8af2b08171635e2ea8b6e8e6e48
Chris Manton [Wed, 16 Dec 2020 23:27:02 +0000 (15:27 -0800)]
Add stack/acl/btm_pm::StackAclBtmPm::btm_pm_get_power_manager_from_handle
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ia7ed94b87c1c75f451fea15f104380838dd04a7b
Chris Manton [Tue, 15 Dec 2020 17:27:40 +0000 (09:27 -0800)]
Add stack/acl/btm_acl::acl_disconnect_from_handle
Handles are in progress of being all recaptured, but
expose this as a replacement for the after_role_switch
as that is an internal ACL implementation decision.
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I88c15fd03a6fffe41178523fba4979ca70e4fa19
Chris Manton [Tue, 15 Dec 2020 06:51:55 +0000 (22:51 -0800)]
Add stack/acl/btm_acl::hci_btsnd_hcic_disconnect
Group common hci surfaces
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Iec30cc23baba679603684bce3f2a24641fe77bb6
Chris Manton [Tue, 8 Dec 2020 21:34:52 +0000 (13:34 -0800)]
Add tBTA_DM_SSR_SPEC.name[] field for sniff subrating options
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I4c3005f0648a4c8b3b9fdba4fe4489caf9283a5f
Chris Manton [Tue, 8 Dec 2020 06:54:59 +0000 (22:54 -0800)]
Add bta/dm/bta_dm_int::device_info_text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ia3ac16047595c032b2c703133eed4fea3cc97967
Chen Chen [Thu, 17 Dec 2020 08:43:38 +0000 (08:43 +0000)]
Merge "Updateability: Remove IBluetoothHeadsetPhone aidl"
Treehugger Robot [Wed, 16 Dec 2020 22:27:31 +0000 (22:27 +0000)]
Merge "set_report API should use HID control channel to send data"
Zach Johnson [Wed, 16 Dec 2020 20:43:23 +0000 (12:43 -0800)]
use common data + payload for hci & hal facades
the special names for each method add no extra details
also, make hci ACL sending purely data packet based and use packet
building instead to create the bytes
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run
Change-Id: Ib4aff269b25851b867676e7b690cafa6b75442a8
Zach Johnson [Wed, 16 Dec 2020 19:08:14 +0000 (11:08 -0800)]
rusty-gd: create singular proto facade lib
need to rename input files so they are unique
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I9f2f0099085db2480950803658a96d005289521f
Zach Johnson [Wed, 16 Dec 2020 21:57:50 +0000 (21:57 +0000)]
Merge changes I10a05872,I1a990478
* changes:
IsoPacket -> Iso, ScoPacket -> Sco
AclPacket -> Acl
Zach Johnson [Wed, 16 Dec 2020 21:29:15 +0000 (21:29 +0000)]
Merge "EventPacket -> Event"
Myles Watson [Wed, 16 Dec 2020 19:30:23 +0000 (11:30 -0800)]
gd: Default to rotating addresses
Tag: #gd-refactor
Bug:
169125803
Test: cert/run
Change-Id: I608c5c57e2e0ece5329e7bb993e6a5288261eb2d
Treehugger Robot [Wed, 16 Dec 2020 19:18:26 +0000 (19:18 +0000)]
Merge changes Ia88c2415,Icc104e2f
* changes:
Group upper layer notifications stack/acl/btm_acl::
Add bta/dm/bta_dm_act::BTA_dm_notify_remote_features_complete
Zach Johnson [Sun, 13 Dec 2020 02:21:00 +0000 (18:21 -0800)]
IsoPacket -> Iso, ScoPacket -> Sco
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I10a058723fe42c731808d6005a9ed32c928e10c0
Zach Johnson [Sun, 13 Dec 2020 02:12:24 +0000 (18:12 -0800)]
AclPacket -> Acl
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I1a990478af55cfce722466b955fe4adc80fa30b1
Zach Johnson [Sun, 13 Dec 2020 01:58:24 +0000 (17:58 -0800)]
EventPacket -> Event
simpler
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ib493861824c05d3a019e25d9fed8ad09cfac55dd
Zach Johnson [Wed, 16 Dec 2020 18:39:30 +0000 (18:39 +0000)]
Merge "CommandPacket -> Command"
Hansong Zhang [Mon, 14 Dec 2020 23:23:35 +0000 (15:23 -0800)]
L2cap shim: Send the correct disconnect callback
Tag: #gd-refactor
Test: CtsVerifier
Bug:
141555841
Change-Id: I939f0fa0ea4d66c11ec282bbc693b22c6804b76a
Treehugger Robot [Wed, 16 Dec 2020 17:48:02 +0000 (17:48 +0000)]
Merge changes I5f1244d7,Ie41c2519,Ie07221ad
* changes:
gd: Enable advertising module by INIT flag
gd: Prevent set privacy policy twice
gd: Handle periodic advertising in start advertising
Chris Manton [Tue, 15 Dec 2020 21:49:27 +0000 (13:49 -0800)]
Group upper layer notifications stack/acl/btm_acl::
Eventual interface replacement
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ia88c24158d8de4500d1bccbd8685318ac8433bfa
Chris Manton [Thu, 10 Dec 2020 05:18:41 +0000 (21:18 -0800)]
Add bta/dm/bta_dm_act::BTA_dm_notify_remote_features_complete
Although the connection has been made, subsequent queries
of remote host may not have been completed. One important
set of data BTA requires is the remote features.
This callback allows synchronization for valid remote
features.
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Icc104e2f47bd79f904a684a7290ca38a123e3cfb
Chienyuan [Wed, 16 Dec 2020 11:59:19 +0000 (19:59 +0800)]
gd: Enable advertising module by INIT flag
Tag: #gd-refactor
Bug:
169125803
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: I5f1244d71a77b9d8f470dfd621d50bd23788529b
Treehugger Robot [Wed, 16 Dec 2020 11:14:47 +0000 (11:14 +0000)]
Merge changes Ia3a8c7e1,I65bac30e,Ide1a5faa,I64f5be7d,Id19aa6c9, ...
* changes:
enum-ify bta/include/bta_api::BTA_DM_PM_
Remove #def and use IsEprAvailable
Use proper tHCI_STATUS types
Inclusive language BTM_DEV_BLACKLISTED => BTM_DEV_RESTRICT_LISTED
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_remote_features_complete
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_remote_ext_features_complete
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_tx_power_complete
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_automatic_flush_timeout_complete
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_rssi_complete
Re-log and properly type bta/dm/bta_dm_pm::bta_dm_pm_sniff
Properly type bta/.../::BTA_SYS_CONN_OPEN
Properly type args stack/acl/btm_pm::BTM_ReadPowerMode
Add bta/sys/bta_sys::bta_sys_conn_status_text
enum-ify bta/sys/bta_sys::tBTA_SYS_CONN_STATUS
Add stack/include/btm_status::btm_status_text
gd_acl: Remove redundant call stack/l2cap/l2c_link
Chienyuan [Wed, 16 Dec 2020 10:00:59 +0000 (18:00 +0800)]
gd: Prevent set privacy policy twice
Tag: #gd-refactor
Bug:
169125803
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: Ie41c2519818edff3061d77c4df1e126f976fa0c2
Treehugger Robot [Wed, 16 Dec 2020 10:04:25 +0000 (10:04 +0000)]
Merge "Cert: Pin Code Test"
Chienyuan [Wed, 16 Dec 2020 06:41:34 +0000 (14:41 +0800)]
gd: Handle periodic advertising in start advertising
Tag: #gd-refactor
Bug:
169125803
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: Ie07221ad62a5d7674f8cfc6b2253231b5f15f668
Chris Manton [Thu, 10 Dec 2020 00:31:56 +0000 (16:31 -0800)]
enum-ify bta/include/bta_api::BTA_DM_PM_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ia3a8c7e18de52d1b4b2b73ea76ce57586c954a4e
Chris Manton [Fri, 11 Dec 2020 00:14:05 +0000 (16:14 -0800)]
Remove #def and use IsEprAvailable
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I65bac30e7060f0cc156676c1f78d2f3482b16835
Chris Manton [Mon, 14 Dec 2020 06:47:04 +0000 (22:47 -0800)]
Use proper tHCI_STATUS types
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ide1a5faa7afbed347a77d5c484a633479bf641ef
Chris Manton [Tue, 15 Dec 2020 18:02:32 +0000 (10:02 -0800)]
Inclusive language BTM_DEV_BLACKLISTED => BTM_DEV_RESTRICT_LISTED
Bug:
170342881
Tag: #refactor
Test: atest --host bluetooth_test_gd
Change-Id: I64f5be7d2aa38a62091fde43b1926479021c10a6
Chris Manton [Sun, 13 Dec 2020 18:54:19 +0000 (10:54 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_remote_features_complete
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Id19aa6c9dd0c5bb010345e8706a55be05b04fcc0
Chris Manton [Sun, 13 Dec 2020 18:46:23 +0000 (10:46 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_remote_ext_features_complete
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I8daa6e06248eb28463b1ef552bbfe3ff547f6d3a
Chris Manton [Sun, 13 Dec 2020 02:24:23 +0000 (18:24 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_tx_power_complete
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ib916439e3d5c0580ce299ee2b5b3b2c07161a78b
Chris Manton [Sun, 13 Dec 2020 01:54:04 +0000 (17:54 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_automatic_flush_timeout_complete
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I474142526f861161f5a95c3214a43ea2794afa5c
Chris Manton [Sun, 13 Dec 2020 01:33:24 +0000 (17:33 -0800)]
Properly retrieve acl_conn stack/acl/btm_acl::btm_read_rssi_complete
Towards encapsulation
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Icade424100d8ca269166b8f3f9179245abb88963
Chris Manton [Tue, 8 Dec 2020 07:03:00 +0000 (23:03 -0800)]
Re-log and properly type bta/dm/bta_dm_pm::bta_dm_pm_sniff
Towards readable code. Classic power mode is a mess
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Idd88f6b53eb722a2b7477d9b244ae9ab94d63df2
Chris Manton [Sun, 6 Dec 2020 22:43:19 +0000 (14:43 -0800)]
Properly type bta/.../::BTA_SYS_CONN_OPEN
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I063ab292f54a9ae6e1ab488030fb82f0a4576e49
Chris Manton [Tue, 8 Dec 2020 06:35:06 +0000 (22:35 -0800)]
Properly type args stack/acl/btm_pm::BTM_ReadPowerMode
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I94620f506d0fc5ee32f1fe8a5dc75dc5915dd6af
Chris Manton [Sun, 6 Dec 2020 22:49:06 +0000 (14:49 -0800)]
Add bta/sys/bta_sys::bta_sys_conn_status_text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I1a43557474ede94add88fe98bece0dda81520315
Chris Manton [Sun, 6 Dec 2020 22:43:35 +0000 (14:43 -0800)]
enum-ify bta/sys/bta_sys::tBTA_SYS_CONN_STATUS
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I1b8e4555ab6754d74f0058b4909a6e06718af035
Chris Manton [Tue, 8 Dec 2020 22:26:10 +0000 (14:26 -0800)]
Add stack/include/btm_status::btm_status_text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I0c28b56845e4d0c37931842ee882a4c55c5ab98a
Chris Manton [Fri, 4 Dec 2020 23:25:40 +0000 (15:25 -0800)]
gd_acl: Remove redundant call stack/l2cap/l2c_link
Previous arch had l2cap driving the btm layer.
The new legacy acl/btm layer sits between the l2cap
layer and the hci layer. The call path has
already been exercised by this time and is called twice
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I8e83a79020f0c9cdfaab0916af1a8e2028e130ca
Hansong Zhang [Tue, 15 Dec 2020 21:41:32 +0000 (13:41 -0800)]
LE L2cap: Use client callback if locally initiated
Don't use callbacks for registered service (we as server). This could
confuse user (shim).
Tag: #gd-refactor
Test: CtsVerifier
Bug:
141555841
Change-Id: Icde090fa609043a61301c18782874dad9ade99d1
Zach Johnson [Sun, 13 Dec 2020 01:32:32 +0000 (17:32 -0800)]
CommandPacket -> Command
drop the packet, it's simpler.
CommandPacket is already a packet, and the generated Rust packets will
have Packet appended in some cases, which would lead to
CommandPacketPacket, which is not great.
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I5ad00f7c0f0d2dda83b3e1213145f0bd87c799e0
Zach Johnson [Wed, 16 Dec 2020 03:20:00 +0000 (03:20 +0000)]
Merge changes If1e078bd,I8ee5baf6
* changes:
rusty-gd: refine stack ffi a bit
Apply rustfmt to keep checkin hook happy
Treehugger Robot [Wed, 16 Dec 2020 03:14:36 +0000 (03:14 +0000)]
Merge "Revert "Cert: Temporarily disable the SSP OOB test""
Myles Watson [Wed, 16 Dec 2020 01:05:26 +0000 (01:05 +0000)]
Revert "Cert: Temporarily disable the SSP OOB test"
This reverts commit
e17119395069b33a0f6e1080e80d5b1e10c35be4.
Reason for revert: The CL that fixed the test landed
Bug:
175033589
Test: cert/run SecurityTest
Tag: #gd-refactor
Change-Id: I4dd577f53a45abb2e0f6c52fc3d577ed6ab8e3ce