OSDN Git Service

android-x86/system-bt.git
3 years agogd: implement APIs of Advertising for Legacy
Chienyuan [Tue, 24 Nov 2020 11:54:14 +0000 (19:54 +0800)]
gd: implement APIs of Advertising for Legacy

Tag: #gd-refactor
Bug: 169125803
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: I317b75c93619f99df6ff40b46fbb44c23e21f437

3 years agoMerge "gd: LE Advertising manager fragmentation"
Treehugger Robot [Tue, 24 Nov 2020 03:25:52 +0000 (03:25 +0000)]
Merge "gd: LE Advertising manager fragmentation"

3 years agoL2cap shim: Introduce Classic Dynamic Channel Helper
Hansong Zhang [Fri, 20 Nov 2020 00:13:02 +0000 (16:13 -0800)]
L2cap shim: Introduce Classic Dynamic Channel Helper

Same as LE.

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: Ie9c85f5bdadf5235095d357ae77d1668d7fcc694

3 years agoL2cap shim namespace clean up
Hansong Zhang [Thu, 19 Nov 2020 23:51:43 +0000 (15:51 -0800)]
L2cap shim namespace clean up

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: Id1b152a6f679b5141c1ae80eab0696d6dafe6087

3 years agoGD L2cap shim workaround
Hansong Zhang [Wed, 18 Nov 2020 02:38:37 +0000 (18:38 -0800)]
GD L2cap shim workaround

* Fix a workflow in classic security enforcement
* Use the ACL workaround for address policy

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: I31e439ae40f0db98aeed10ec6872a1f25c4f94d0

3 years agorusty-gd: properly read ACL data from the HAL
Zach Johnson [Sun, 15 Nov 2020 00:34:07 +0000 (16:34 -0800)]
rusty-gd: properly read ACL data from the HAL

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ic6ed193f89a689a255820704b606b8ffb03a9ee0

3 years agoMerge changes Ib8d0227e,I2bcd02ea
Zach Johnson [Mon, 23 Nov 2020 19:28:11 +0000 (19:28 +0000)]
Merge changes Ib8d0227e,I2bcd02ea

* changes:
  rusty-packets: rename packets & add packet child enums
  rusty-packets: stub out struct & packet generation

3 years agoMerge "rusty-packets: generate sample enums and make this work end to end"
Zach Johnson [Mon, 23 Nov 2020 17:47:44 +0000 (17:47 +0000)]
Merge "rusty-packets: generate sample enums and make this work end to end"

3 years agobtsnoop: Fix ISO handling
Łukasz Rymanowski [Wed, 9 Sep 2020 08:04:37 +0000 (08:04 +0000)]
btsnoop: Fix ISO handling

Sponsor: jpawlowski@
Tag: #feature
Bug: 150670922
Test: manually verified content of btsnoop log
Change-Id: Ie5cac9c189acf808761ac4213c8eadb497fdb531

3 years agogd: LE Advertising manager fragmentation
Chienyuan [Tue, 17 Nov 2020 13:06:16 +0000 (21:06 +0800)]
gd: LE Advertising manager fragmentation

Tag: #gd-refactor
Bug: 149221472
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: I03a84ad57ca16d0df3d1e58f570342b6b8d89513

3 years agorusty-packets: rename packets & add packet child enums
Zach Johnson [Sat, 21 Nov 2020 21:49:39 +0000 (13:49 -0800)]
rusty-packets: rename packets & add packet child enums

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ib8d0227e6d51d4bebbe28ddf61e957c943824185

3 years agorusty-packets: stub out struct & packet generation
Zach Johnson [Sat, 21 Nov 2020 01:14:43 +0000 (17:14 -0800)]
rusty-packets: stub out struct & packet generation

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I2bcd02ea82f0e128e3125d93cacc4c2950ac1330

3 years agoMerge changes Ia3d9e7e3,Ie2e264e9,I8767e4f9,I78716099
Zach Johnson [Sat, 21 Nov 2020 00:59:15 +0000 (00:59 +0000)]
Merge changes Ia3d9e7e3,Ie2e264e9,I8767e4f9,I78716099

* changes:
  rusty-packets: generate a file that's ready for content
  rusty-packets: move some cpp generation to raw strings, for clarity
  rusty-packets: stub out rust generation function
  rusty-packets: move C++ and pybind11 to their own file

3 years agorusty-packets: generate sample enums and make this work end to end
Zach Johnson [Sat, 21 Nov 2020 00:57:33 +0000 (16:57 -0800)]
rusty-packets: generate sample enums and make this work end to end

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I9467b6871b3072a64d06bcd8b79887bc6e85c010

3 years agoL2cap shim flag update
Hansong Zhang [Wed, 18 Nov 2020 02:38:21 +0000 (18:38 -0800)]
L2cap shim flag update

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: Iccb704e6d87f6758c4af7cd9148b88d00751b1c2

3 years agoMerge "Use std::optional instead of std::unique_ptr"
Jooyung Han [Sat, 21 Nov 2020 00:45:44 +0000 (00:45 +0000)]
Merge "Use std::optional instead of std::unique_ptr"

3 years agoMerge changes from topic "gd_oob"
Myles Watson [Fri, 20 Nov 2020 20:37:38 +0000 (20:37 +0000)]
Merge changes from topic "gd_oob"

* changes:
  Security: Add a keyboard bonding test
  RootCanal: Add Passkey and PasskeyFailed
  HciMatchers: enforce argument requirement
  Rename GetOutOfBandData -> GetLeOutOfBandData
  Facade OobDataMessage: Rename members to be generic.
  SecurityTest: Create bond Out of Band

3 years agorusty-packets: generate a file that's ready for content
Zach Johnson [Fri, 20 Nov 2020 18:26:01 +0000 (10:26 -0800)]
rusty-packets: generate a file that's ready for content

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ia3d9e7e3d0b8f388204fd22d6ce4df2760af60de

3 years agorusty-packets: move some cpp generation to raw strings, for clarity
Zach Johnson [Fri, 20 Nov 2020 00:24:39 +0000 (16:24 -0800)]
rusty-packets: move some cpp generation to raw strings, for clarity

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ie2e264e95630f37a5474f67978e23d2192f89025

3 years agoMerge "rusty-packets: add rust option to switch generated packet type"
Zach Johnson [Fri, 20 Nov 2020 17:41:33 +0000 (17:41 +0000)]
Merge "rusty-packets: add rust option to switch generated packet type"

3 years agoSecurity: Add a keyboard bonding test
Myles Watson [Thu, 19 Nov 2020 19:00:49 +0000 (11:00 -0800)]
Security: Add a keyboard bonding test

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I98b7e16fb8790b001b79e9c802e45b9f180bb203

3 years agoRootCanal: Add Passkey and PasskeyFailed
Myles Watson [Sat, 14 Nov 2020 05:25:51 +0000 (21:25 -0800)]
RootCanal: Add Passkey and PasskeyFailed

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I54f2fb20bf1a071b60c9e621ca40d9e850268909

3 years agoHciMatchers: enforce argument requirement
Martin Brabham [Wed, 18 Nov 2020 00:17:03 +0000 (16:17 -0800)]
HciMatchers: enforce argument requirement

If the command complete opcode is not specified then it
will match ANY command complete event which can prove to
be troubles some when getting a series of CommandComplete()
matches.

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: Ia42c74c6476fd9d0763afa87ad1f61a243942e27

3 years agoRename GetOutOfBandData -> GetLeOutOfBandData
Martin Brabham [Tue, 17 Nov 2020 22:26:57 +0000 (14:26 -0800)]
Rename GetOutOfBandData -> GetLeOutOfBandData

Currently, this function is only used by cert tests.
This rename is a stopgap until it is dropped from the
FacadeConfigurationApi interface in favor of the SecurityManager
interface.

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest:test_successful_dut_initiated_ssp_oob
Test: cert/run --host LeSecurityTest
Change-Id: Ib1a79de46d3a59ec1c14338e8328718d114aed2a

3 years agoFacade OobDataMessage: Rename members to be generic.
Martin Brabham [Tue, 17 Nov 2020 22:00:47 +0000 (14:00 -0800)]
Facade OobDataMessage: Rename members to be generic.

Member names are LE specific when that isn't necessary.
Renaming as Classic now uses the same message too.

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest:test_successful_dut_initiated_ssp_oob
Test: cert/run --host LeSecurityTest
Change-Id: Ifd2c311a73d3e11cc64e287f18a5cb3e386e2f3c

3 years agoSecurityTest: Create bond Out of Band
Martin Brabham [Tue, 17 Nov 2020 02:01:43 +0000 (18:01 -0800)]
SecurityTest: Create bond Out of Band

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest:test_successful_dut_initiated_ssp_oob
Change-Id: I18c58bc7d9a6f33363befd60d8089544fe060ee9

3 years agoPySecurity: Add create_bond_out_of_band
Martin Brabham [Tue, 17 Nov 2020 02:01:18 +0000 (18:01 -0800)]
PySecurity: Add create_bond_out_of_band

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I41ac53a3b29e2409a1eb2da60abe8f37db84a9f4

3 years agoSecurity Facade: Implement CreateBondOutOfBand
Martin Brabham [Tue, 17 Nov 2020 01:18:42 +0000 (17:18 -0800)]
Security Facade: Implement CreateBondOutOfBand

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I78766ba130578b434298e739135951c9713a6748

3 years agoClassicPairingHandler: Add Out of Band support.
Martin Brabham [Tue, 17 Nov 2020 01:14:01 +0000 (17:14 -0800)]
ClassicPairingHandler: Add Out of Band support.

Adds support for p192, p256, and both.  As well as
secure connections "extended data" versions of the
RemoteOobDataRequestReply.

Add several unit tests to verify the pairing handler
correctly behaves.

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd -- --test-arg com.android.tradefed.testtype.GTest:native-test-flag:--gtest_filter=ClassicPairingHandlerTest*
Change-Id: I72016f380a29ad11ec9bdd9e0dcb3383c092c830

3 years agorusty-packets: stub out rust generation function
Zach Johnson [Thu, 19 Nov 2020 23:51:17 +0000 (15:51 -0800)]
rusty-packets: stub out rust generation function

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I8767e4f9ebcf8de6930ab905142afc1a002fdb43

3 years agorusty-packets: move C++ and pybind11 to their own file
Zach Johnson [Thu, 19 Nov 2020 23:34:01 +0000 (15:34 -0800)]
rusty-packets: move C++ and pybind11 to their own file

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I787160993d299b0102daa0a92add4b61f036be43

3 years agorusty-packets: add rust option to switch generated packet type
Zach Johnson [Thu, 19 Nov 2020 23:14:42 +0000 (15:14 -0800)]
rusty-packets: add rust option to switch generated packet type

also add some debug messages to make it easier to see what
the C++ version is doing.

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I0832bb74cffeeb0474aa0f81545a667d4ab6c1bb

3 years agoMerge changes Idfc28489,I56a62a3c,Ibfea3d22
Treehugger Robot [Thu, 19 Nov 2020 21:45:54 +0000 (21:45 +0000)]
Merge changes Idfc28489,I56a62a3c,Ibfea3d22

* changes:
  Improve shim Btm::GetAddressType
  Fix stack shutdown
  GD L2cap improvements

3 years agoMerge "RootCanal: Allow both sides to have OOB data"
Treehugger Robot [Thu, 19 Nov 2020 21:42:34 +0000 (21:42 +0000)]
Merge "RootCanal: Allow both sides to have OOB data"

3 years agoImprove shim Btm::GetAddressType
Hansong Zhang [Wed, 18 Nov 2020 00:42:10 +0000 (16:42 -0800)]
Improve shim Btm::GetAddressType

If legacy btm already knows its type, use it.

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: Idfc28489f7d674dba7c724baccce0d4ee9170831

3 years agoIntroduce LE COC security enforcement shim
Hansong Zhang [Tue, 17 Nov 2020 23:13:51 +0000 (15:13 -0800)]
Introduce LE COC security enforcement shim

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: Iad2d1e71582886c05a4c7df39cc85735cb3f8abf

3 years agoFix stack shutdown
Hansong Zhang [Wed, 18 Nov 2020 20:51:38 +0000 (12:51 -0800)]
Fix stack shutdown

Stop main thread first, before btm shutdown, so that we won't handle
ADV reports during shutdown.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I56a62a3c193997bc2e548dee38817ef758d82f2f

3 years agoGD L2cap improvements
Hansong Zhang [Wed, 18 Nov 2020 00:37:53 +0000 (16:37 -0800)]
GD L2cap improvements

* Store the role from updates.
* Update PSM check.  LE doesn't need it because it uses SPSM.

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: Ibfea3d227a999c8e31e6897628c257084b43174e

3 years agoMerge changes Ic66d8fcd,I9ffbe874,I59e6926b,I1fb172f7,I0eb60ace, ...
Zach Johnson [Thu, 19 Nov 2020 18:36:42 +0000 (18:36 +0000)]
Merge changes Ic66d8fcd,I9ffbe874,I59e6926b,I1fb172f7,I0eb60ace, ...

* changes:
  Add some wait commands inside PyHal
  Simplify scan parameters & start/stop
  Simplify le random address setting for tests
  Simplify le connection logic for SimpleHalTest
  Simplify Le connect logic for SimpleHalTest
  Simplify advertisement in SimpleHalTest
  Add HciMatchers.Exactly, for more compact tests
  Add HAL reset helper
  Add advertisement abstraction in PyHal
  Add an advertisment abstraction to PyHci

3 years agogd: Add hci error code CONNECTION_FAILED_ESTABLISHMENT
Chris Manton [Wed, 18 Nov 2020 20:51:18 +0000 (12:51 -0800)]
gd: Add hci error code CONNECTION_FAILED_ESTABLISHMENT

Occurs when a connection ACL is requested to a given
device but there is already an existing ACL connection.

Bug: 145832107
Test: gd/cert/run --host
Tag: #refactor
Change-Id: I609374ba9376f2a1056971fc514d97615931c62a

3 years agoMerge changes I333524dc,Ia460804d,I90cfe69e,I848e344b,Ie9108602, ...
Zach Johnson [Thu, 19 Nov 2020 04:49:39 +0000 (04:49 +0000)]
Merge changes I333524dc,Ia460804d,I90cfe69e,I848e344b,Ie9108602, ...

* changes:
  Add read_own_addres to PyHal
  Simplify ACL connection components of DirectHciTest
  Add send_acl_first to PyHal, to simplify redundancy
  Fold ACL sending into PyHal
  Simplify ACL sending in SimpleHalTest
  Add shortcut for enabling inquiry in PyHal
  Simplify DirectHciTest send_hal_acl_data
  Add HciMatchers.LoopbackOf to avoid imprecise matching
  Improve signal to noise in DirectHciTest
  DirectHciTest, remove send_hal_hci_command
  Improve hci facade proto

3 years agoRootCanal: Allow both sides to have OOB data
Myles Watson [Thu, 19 Nov 2020 01:16:59 +0000 (17:16 -0800)]
RootCanal: Allow both sides to have OOB data

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I1c30296ec80aaac883fc3012982bf6fb76c34771

3 years agoAdd some wait commands inside PyHal
Zach Johnson [Sat, 14 Nov 2020 23:50:00 +0000 (15:50 -0800)]
Add some wait commands inside PyHal

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: Ic66d8fcd09f3c930de0a8b1063ec355e86df4d20

3 years agoSimplify scan parameters & start/stop
Zach Johnson [Sat, 14 Nov 2020 23:12:41 +0000 (15:12 -0800)]
Simplify scan parameters & start/stop

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I9ffbe874bf84e338bd1d38873fbecac6f83fa9b5

3 years agoSimplify le random address setting for tests
Zach Johnson [Sat, 14 Nov 2020 23:06:34 +0000 (15:06 -0800)]
Simplify le random address setting for tests

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I59e6926bb00b377b3580742800fbe2743c067181

3 years agoSimplify le connection logic for SimpleHalTest
Zach Johnson [Sat, 14 Nov 2020 23:00:43 +0000 (15:00 -0800)]
Simplify le connection logic for SimpleHalTest

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I1fb172f75ccd01fd449af2748ea9885991822594

3 years agoSimplify Le connect logic for SimpleHalTest
Zach Johnson [Sat, 14 Nov 2020 22:52:03 +0000 (14:52 -0800)]
Simplify Le connect logic for SimpleHalTest

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I0eb60ace4e5b354803fcbb331484cbb556f86e0f

3 years agoSimplify advertisement in SimpleHalTest
Zach Johnson [Sat, 14 Nov 2020 21:39:14 +0000 (13:39 -0800)]
Simplify advertisement in SimpleHalTest

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I297cfeac69b143d5783122f1ec103fd67af11446

3 years agoAdd read_own_addres to PyHal
Zach Johnson [Fri, 13 Nov 2020 05:34:43 +0000 (21:34 -0800)]
Add read_own_addres to PyHal

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I333524dcc50d7f9cc586ab66514cab04908686ab

3 years agoAdd HciMatchers.Exactly, for more compact tests
Zach Johnson [Sat, 14 Nov 2020 21:28:09 +0000 (13:28 -0800)]
Add HciMatchers.Exactly, for more compact tests

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: If87927d3e491f234000b7c9321832897e91bba04

3 years agoSimplify ACL connection components of DirectHciTest
Zach Johnson [Fri, 13 Nov 2020 05:22:22 +0000 (21:22 -0800)]
Simplify ACL connection components of DirectHciTest

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: Ia460804d5a8654b3ba305ca414ba1797498aecd3

3 years agoAdd HAL reset helper
Zach Johnson [Sat, 14 Nov 2020 20:48:57 +0000 (12:48 -0800)]
Add HAL reset helper

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: Ia2df0a7e05e8d8fccc8af5005c3fb2e4a5d6a6fe

3 years agoAdd send_acl_first to PyHal, to simplify redundancy
Zach Johnson [Fri, 13 Nov 2020 04:36:10 +0000 (20:36 -0800)]
Add send_acl_first to PyHal, to simplify redundancy

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I90cfe69ec30ed6b92366df81874c2ab30abe7f84

3 years agoAdd advertisement abstraction in PyHal
Zach Johnson [Fri, 13 Nov 2020 18:16:32 +0000 (10:16 -0800)]
Add advertisement abstraction in PyHal

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I07d3bb46876f86fb2aba74b49cddde7425703937

3 years agoFold ACL sending into PyHal
Zach Johnson [Fri, 13 Nov 2020 04:22:27 +0000 (20:22 -0800)]
Fold ACL sending into PyHal

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I848e344bca3b4b2516a061fdd3c221a5a9409db4

3 years agoAdd an advertisment abstraction to PyHci
Zach Johnson [Fri, 13 Nov 2020 06:23:41 +0000 (22:23 -0800)]
Add an advertisment abstraction to PyHci

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I919e9769023f53ac645313a151fdff8e70417e26

3 years agoSimplify ACL sending in SimpleHalTest
Zach Johnson [Fri, 13 Nov 2020 04:17:56 +0000 (20:17 -0800)]
Simplify ACL sending in SimpleHalTest

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: Ie9108602b0b23701a0cf9c98c4a3f314db389dd1

3 years agoAdd shortcut for enabling inquiry in PyHal
Zach Johnson [Fri, 13 Nov 2020 04:09:30 +0000 (20:09 -0800)]
Add shortcut for enabling inquiry in PyHal

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I74197927c8a61b9ab970557a9f49830b26b2d876

3 years agoSimplify DirectHciTest send_hal_acl_data
Zach Johnson [Fri, 13 Nov 2020 03:52:55 +0000 (19:52 -0800)]
Simplify DirectHciTest send_hal_acl_data

first step towards more general code

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I4957acd5868f4d079fdffb255df16200e919429b

3 years agoAdd HciMatchers.LoopbackOf to avoid imprecise matching
Zach Johnson [Fri, 13 Nov 2020 02:09:49 +0000 (18:09 -0800)]
Add HciMatchers.LoopbackOf to avoid imprecise matching

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: Id9b18af3075225b3ac09a6af485d424476151b33

3 years agoImprove signal to noise in DirectHciTest
Zach Johnson [Fri, 13 Nov 2020 00:53:45 +0000 (16:53 -0800)]
Improve signal to noise in DirectHciTest

import concrete objects instead of hci_packets.xyz everywhere

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: Ie906397e586ee6c12ef533d9201f7e11f4ca5f35

3 years agoDirectHciTest, remove send_hal_hci_command
Zach Johnson [Fri, 13 Nov 2020 00:20:14 +0000 (16:20 -0800)]
DirectHciTest, remove send_hal_hci_command

call to the PyHal helper instead

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host DirectHciTest
Change-Id: I432c0ccd92b8dd717fda943952605062fa6e8d23

3 years agoImprove hci facade proto
Zach Johnson [Fri, 13 Nov 2020 00:16:05 +0000 (16:16 -0800)]
Improve hci facade proto

reduce redundant or extra words

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --host
Change-Id: I3994dcf0cb41784a660e6c28987b9be306f42d87

3 years agoMerge "remove invalid test, restucture simple_hal_test"
Zach Johnson [Wed, 18 Nov 2020 22:09:19 +0000 (22:09 +0000)]
Merge "remove invalid test, restucture simple_hal_test"

3 years agoMerge changes I9b41e751,If93d4d62
Zach Johnson [Wed, 18 Nov 2020 17:20:31 +0000 (17:20 +0000)]
Merge changes I9b41e751,If93d4d62

* changes:
  rusty-gd: plumb through ACL in the hal
  rusty-gd: plumb through commands and events for the hci hal facade

3 years agoMerge "RootCanal: Allow only the peer to have OOB data"
Treehugger Robot [Wed, 18 Nov 2020 17:08:57 +0000 (17:08 +0000)]
Merge "RootCanal: Allow only the peer to have OOB data"

3 years agoUse std::optional instead of std::unique_ptr
Jooyung Han [Wed, 18 Nov 2020 12:57:57 +0000 (21:57 +0900)]
Use std::optional instead of std::unique_ptr

Since Android R, Parcel provides read/write methods for "@nullable"
values using std::optional.

Bug: 149784838
Tag: #refactor
Test: atest --host bluetooth_test_gd
Change-Id: Iae76dc0d7a991888687cf572a43b26b28ad2e93d

3 years agoMerge "shim: check subevent for advertising module"
Treehugger Robot [Wed, 18 Nov 2020 05:56:49 +0000 (05:56 +0000)]
Merge "shim: check subevent for advertising module"

3 years agoRootCanal: Allow only the peer to have OOB data
Myles Watson [Wed, 18 Nov 2020 03:02:43 +0000 (19:02 -0800)]
RootCanal: Allow only the peer to have OOB data

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I9ea880d906ac607e659f1532dd093127fa0f7e0a

3 years agoHci layer: Minor clean up
Hansong Zhang [Tue, 17 Nov 2020 23:05:15 +0000 (15:05 -0800)]
Hci layer: Minor clean up

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: I5498e56285a6523d0ce3199777c5677e9fdf6bbc

3 years agoMerge "enum-ify stack/include/bt_types::BT_PSM_"
Chris Manton [Wed, 18 Nov 2020 00:50:23 +0000 (00:50 +0000)]
Merge "enum-ify stack/include/bt_types::BT_PSM_"

3 years agoL2cap shim improvement
Hansong Zhang [Thu, 5 Nov 2020 23:41:54 +0000 (15:41 -0800)]
L2cap shim improvement

Implement ReadRemoteVersion in L2cap shim.
Notify BTA layer directly when connection is up/down.

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: I193bb24c52f06039359aeda84d68f429d60bf33b

3 years agoL2cap shim: Add role switch
Hansong Zhang [Thu, 5 Nov 2020 23:35:45 +0000 (15:35 -0800)]
L2cap shim: Add role switch

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7fd643ca263e47a4d1f28ee87c72622774c61469

3 years agoenum-ify stack/include/bt_types::BT_PSM_
Chris Manton [Fri, 13 Nov 2020 23:55:42 +0000 (15:55 -0800)]
enum-ify stack/include/bt_types::BT_PSM_

Toward readable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: Icf24f483a807c28763bf677f5d01b13cc3c9c553

3 years agoremove invalid test, restucture simple_hal_test
Zach Johnson [Thu, 12 Nov 2020 20:57:34 +0000 (12:57 -0800)]
remove invalid test, restucture simple_hal_test

use PyHal abstractions

test_none_event only passed on C++ gd because the reset event
was dropped because the test had not yet asked for the event
stream.

doesn't happen with rust, so the test was failing. by using the
abstractions, the stream gets registered before anthing happens
so the behavior is consistent.

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I88e7cc45d194030fdff10a247ff8bc09e6473bb5

3 years agorusty-gd: plumb through ACL in the hal
Zach Johnson [Thu, 12 Nov 2020 01:43:29 +0000 (17:43 -0800)]
rusty-gd: plumb through ACL in the hal

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I9b41e7515384d062155dbb414ce79394c1abcd36

3 years agorusty-gd: plumb through commands and events for the hci hal facade
Zach Johnson [Wed, 11 Nov 2020 23:19:48 +0000 (15:19 -0800)]
rusty-gd: plumb through commands and events for the hci hal facade

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: If93d4d62e3c4d030fdf94082172c00dcb2ca47e8

3 years agoacl: Implement ReadRemoteVersionInformation for LE
Myles Watson [Tue, 17 Nov 2020 17:35:54 +0000 (09:35 -0800)]
acl: Implement ReadRemoteVersionInformation for LE

Bug: 172725986
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: I114c5510ea8396244c68b11b333249092333cff9

3 years agoacl: Remove DisconnectorForLe
Myles Watson [Tue, 17 Nov 2020 15:30:54 +0000 (07:30 -0800)]
acl: Remove DisconnectorForLe

Bug: 172725986
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Id9a5dcbba3f4be0490baa13d3ff538f0f2158c5c

3 years agoAdd AclCommands for LE and BR/EDR
Myles Watson [Tue, 17 Nov 2020 05:24:21 +0000 (21:24 -0800)]
Add AclCommands for LE and BR/EDR

Bug: 172725986
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: I822ce0751be08a98a30c219853e1540e2e461a08

3 years agoMerge "hci: Close linter IfChange block"
Treehugger Robot [Tue, 17 Nov 2020 07:03:43 +0000 (07:03 +0000)]
Merge "hci: Close linter IfChange block"

3 years agohci: Close linter IfChange block
Myles Watson [Tue, 17 Nov 2020 05:34:20 +0000 (21:34 -0800)]
hci: Close linter IfChange block

Bug: 172725986
Test: Upload CL and look for the linter complaining
Tag: #gd-refactor
Change-Id: Iadc778588d6ef95253c1efa4459c39feca845498

3 years agoMerge "btaa: do not initialize btaa module if init flag set to false"
Treehugger Robot [Tue, 17 Nov 2020 01:06:41 +0000 (01:06 +0000)]
Merge "btaa: do not initialize btaa module if init flag set to false"

3 years agoMerge "btaa: null check btaa instance when receiving callback from SystemSuspend"
Treehugger Robot [Mon, 16 Nov 2020 23:17:24 +0000 (23:17 +0000)]
Merge "btaa: null check btaa instance when receiving callback from SystemSuspend"

3 years agobtaa: do not initialize btaa module if init flag set to false
Michael Sun [Mon, 16 Nov 2020 22:24:18 +0000 (22:24 +0000)]
btaa: do not initialize btaa module if init flag set to false

Tag: #feature
Bug: 173435736
Test: m, verified BTAA not get initialized
Change-Id: I6b4195df5c908e5d7ccd7d27424c6bda7d7e5a36

3 years agobtaa: null check btaa instance when receiving callback from SystemSuspend
Michael Sun [Mon, 16 Nov 2020 21:53:12 +0000 (21:53 +0000)]
btaa: null check btaa instance when receiving callback from SystemSuspend

Perform null pointer check upon receive callbacks from SystemSuspend
to mitigation the exception caused crash.

Tag: #feature
Bug: 173435736
Test: m
Change-Id: Ie15d179ebce82fdd91f32b3d8a98bb9bf8c66e84

3 years agoMerge "SecurityManager: Add CreateBondOutOfBand interface."
Treehugger Robot [Mon, 16 Nov 2020 21:52:21 +0000 (21:52 +0000)]
Merge "SecurityManager: Add CreateBondOutOfBand interface."

3 years agoMerge "GD Security OobData"
Treehugger Robot [Mon, 16 Nov 2020 21:28:49 +0000 (21:28 +0000)]
Merge "GD Security OobData"

3 years agoMerge changes I4386b836,I27e6b6ce,I84842b13
Treehugger Robot [Mon, 16 Nov 2020 20:30:58 +0000 (20:30 +0000)]
Merge changes I4386b836,I27e6b6ce,I84842b13

* changes:
  GD Security Facade
  CertSecurity: Add accept_oob_pairing function
  Cert SecurityTest: Create branching conditional for multi test run

3 years agoMerge changes I53b512b1,I1be0028c,Iabd6b355,I7d3ccb15
Myles Watson [Mon, 16 Nov 2020 20:27:23 +0000 (20:27 +0000)]
Merge changes I53b512b1,I1be0028c,Iabd6b355,I7d3ccb15

* changes:
  CertSecurity: Add OOB related interfaces
  PySecurity: Add enable_secure_connections interface
  HciCaptures: Add OOB Related captures
  HciMatchers: Add OOB Related events.

3 years agoMerge "rusty-gd: switch added services based on module under test"
Zach Johnson [Mon, 16 Nov 2020 20:22:59 +0000 (20:22 +0000)]
Merge "rusty-gd: switch added services based on module under test"

3 years agoSecurityManager: Add CreateBondOutOfBand interface.
Martin Brabham [Mon, 16 Nov 2020 18:45:25 +0000 (10:45 -0800)]
SecurityManager: Add CreateBondOutOfBand interface.

Allow for creating bonds with remote Out of Band data.

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I6f6d85cc22fd5b1a1abf6b629ecdd37950b4d239

3 years agoGD Security OobData
Martin Brabham [Mon, 16 Nov 2020 18:39:50 +0000 (10:39 -0800)]
GD Security OobData

Create an object to represent OobData in the Security Module.

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I3bf5645bc15bfcd90180d5f4fbd7c41b6c120add

3 years agoGD Security Facade
Martin Brabham [Fri, 13 Nov 2020 03:38:40 +0000 (19:38 -0800)]
GD Security Facade

Add CreateBondOutOfBand and OobDataBondMessage

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I4386b836810be50c2e49b505ccec9cad08a63b89

3 years agorusty-gd: switch added services based on module under test
Zach Johnson [Wed, 11 Nov 2020 21:54:16 +0000 (13:54 -0800)]
rusty-gd: switch added services based on module under test

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I4c5ea7aa7273b77c95bcc9b8e21d286b35e67d10

3 years agoCertSecurity: Add OOB related interfaces
Martin Brabham [Fri, 13 Nov 2020 23:06:55 +0000 (15:06 -0800)]
CertSecurity: Add OOB related interfaces

 - set_remote_oob_data
 - get_oob_data_from_controller
 - enable_secure_connections

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I53b512b121a24d2c56b0cbeba9e16f38d19c09cd

3 years agoCertSecurity: Add accept_oob_pairing function
Martin Brabham [Sat, 14 Nov 2020 00:06:35 +0000 (16:06 -0800)]
CertSecurity: Add accept_oob_pairing function

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I27e6b6ceedd0fc001f25222db6f0f3189c006e3c

3 years agoPySecurity: Add enable_secure_connections interface
Martin Brabham [Fri, 13 Nov 2020 21:59:46 +0000 (13:59 -0800)]
PySecurity: Add enable_secure_connections interface

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I1be0028cd1b9aed83145ad75e7f62357a91414c5

3 years agoCert SecurityTest: Create branching conditional for multi test run
Martin Brabham [Fri, 13 Nov 2020 23:47:13 +0000 (15:47 -0800)]
Cert SecurityTest: Create branching conditional for multi test run

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I84842b137a7c7e82b138e719feffcdb4e8ae335c

3 years agoHciCaptures: Add OOB Related captures
Martin Brabham [Fri, 13 Nov 2020 00:40:07 +0000 (16:40 -0800)]
HciCaptures: Add OOB Related captures

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: Iabd6b3556114739c75e65253cb5d0eb8169e708e