OSDN Git Service

android-x86/system-bt.git
3 years agoMerge "rusty-packets: add rust option to switch generated packet type" am: f6cc710a71...
Zach Johnson [Fri, 20 Nov 2020 18:20:23 +0000 (18:20 +0000)]
Merge "rusty-packets: add rust option to switch generated packet type" am: f6cc710a71 am: 6fc041ee93

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1506816

Change-Id: Ifd069cdb3b8cc82cf51a8ec1b948dc1f95f20799

3 years agoMerge "rusty-packets: add rust option to switch generated packet type" am: f6cc710a71
Zach Johnson [Fri, 20 Nov 2020 18:06:51 +0000 (18:06 +0000)]
Merge "rusty-packets: add rust option to switch generated packet type" am: f6cc710a71

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1506816

Change-Id: Id42d855e727402558dcef65401c686a464aee773

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 agoPySecurity: Add create_bond_out_of_band am: 5626012ce8 am: f31c654f36
Martin Brabham [Fri, 20 Nov 2020 05:42:27 +0000 (05:42 +0000)]
PySecurity: Add create_bond_out_of_band am: 5626012ce8 am: f31c654f36

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502235

Change-Id: Ic6210a76726a4d0c49cedb21e8e7e7d8f52947fb

3 years agoSecurity Facade: Implement CreateBondOutOfBand am: b48b9800b2 am: b2cfc7dc27
Martin Brabham [Fri, 20 Nov 2020 05:42:25 +0000 (05:42 +0000)]
Security Facade: Implement CreateBondOutOfBand am: b48b9800b2 am: b2cfc7dc27

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502234

Change-Id: I8a34d5235616210a55e795438688815b45717e64

3 years agoClassicPairingHandler: Add Out of Band support. am: 083fe68fa7 am: e2d39b0719
Martin Brabham [Fri, 20 Nov 2020 05:42:22 +0000 (05:42 +0000)]
ClassicPairingHandler: Add Out of Band support. am: 083fe68fa7 am: e2d39b0719

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502233

Change-Id: I542565ccb1ebd71d40740c72a1166adc330583e5

3 years agoPySecurity: Add create_bond_out_of_band am: 5626012ce8
Martin Brabham [Fri, 20 Nov 2020 04:59:27 +0000 (04:59 +0000)]
PySecurity: Add create_bond_out_of_band am: 5626012ce8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502235

Change-Id: I9b3fa47fa4e1f5c498a800a6b1f18c2a095c98b0

3 years agoSecurity Facade: Implement CreateBondOutOfBand am: b48b9800b2
Martin Brabham [Fri, 20 Nov 2020 04:59:24 +0000 (04:59 +0000)]
Security Facade: Implement CreateBondOutOfBand am: b48b9800b2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502234

Change-Id: Idee360edd8aa1fdcbd293e2b27627b7e8a5d06ba

3 years agoClassicPairingHandler: Add Out of Band support. am: 083fe68fa7
Martin Brabham [Fri, 20 Nov 2020 04:59:09 +0000 (04:59 +0000)]
ClassicPairingHandler: Add Out of Band support. am: 083fe68fa7

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502233

Change-Id: Ic2714ce86acb8504f9932e18c318e225c3ec29dc

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: 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 am: 9b5717eb38 am: c8aa7cba48
Treehugger Robot [Thu, 19 Nov 2020 22:03:23 +0000 (22:03 +0000)]
Merge changes Idfc28489,I56a62a3c,Ibfea3d22 am: 9b5717eb38 am: c8aa7cba48

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502161

Change-Id: I68b409be6ec8d5912c5c615a15bd6de62bc46ff9

3 years agoMerge "RootCanal: Allow both sides to have OOB data" am: 7c8a8ef8e3 am: b12991cac2
Treehugger Robot [Thu, 19 Nov 2020 22:03:18 +0000 (22:03 +0000)]
Merge "RootCanal: Allow both sides to have OOB data" am: 7c8a8ef8e3 am: b12991cac2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1504279

Change-Id: Iea5c7dba585c0712e444bbda00bc7a404c519413

3 years agoIntroduce LE COC security enforcement shim am: 43383c4e49 am: ecdc225507
Hansong Zhang [Thu, 19 Nov 2020 22:03:06 +0000 (22:03 +0000)]
Introduce LE COC security enforcement shim am: 43383c4e49 am: ecdc225507

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502244

Change-Id: Ica5ed675820433c5a45e4ec96f46f1ac9ff5edf9

3 years agoMerge changes Idfc28489,I56a62a3c,Ibfea3d22 am: 9b5717eb38
Treehugger Robot [Thu, 19 Nov 2020 21:50:39 +0000 (21:50 +0000)]
Merge changes Idfc28489,I56a62a3c,Ibfea3d22 am: 9b5717eb38

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502161

Change-Id: If1196c22e5f3052b041a3fd55b2517fddedb27fa

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

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1504279

Change-Id: I1494ba6173d1a220835ced65b8bcd2ec9450f187

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 agoIntroduce LE COC security enforcement shim am: 43383c4e49
Hansong Zhang [Thu, 19 Nov 2020 21:27:28 +0000 (21:27 +0000)]
Introduce LE COC security enforcement shim am: 43383c4e49

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502244

Change-Id: I86686a650e4a3b1b77ceed93dfa195eefac3fced

3 years agoMerge changes Ic66d8fcd,I9ffbe874,I59e6926b,I1fb172f7,I0eb60ace, ... am: ee5cdae366...
Zach Johnson [Thu, 19 Nov 2020 19:30:13 +0000 (19:30 +0000)]
Merge changes Ic66d8fcd,I9ffbe874,I59e6926b,I1fb172f7,I0eb60ace, ... am: ee5cdae366 am: d825173fb5

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1499266

Change-Id: Iebf9eeba132cc6f8d3fa109d9d44a92dcb6aaa23

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, ... am: ee5cdae366
Zach Johnson [Thu, 19 Nov 2020 19:14:42 +0000 (19:14 +0000)]
Merge changes Ic66d8fcd,I9ffbe874,I59e6926b,I1fb172f7,I0eb60ace, ... am: ee5cdae366

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1499266

Change-Id: I85ef1eb82c1763a19189ef1b5de7bcebb69328dc

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 am: 787e582564 am: cdb54ca6ac
Chris Manton [Thu, 19 Nov 2020 08:23:12 +0000 (08:23 +0000)]
gd: Add hci error code CONNECTION_FAILED_ESTABLISHMENT am: 787e582564 am: cdb54ca6ac

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1503434

Change-Id: I428cd6b280f3c725aab346c88d1d8716cbfcf7f6

3 years agogd: Add hci error code CONNECTION_FAILED_ESTABLISHMENT am: 787e582564
Chris Manton [Thu, 19 Nov 2020 08:02:29 +0000 (08:02 +0000)]
gd: Add hci error code CONNECTION_FAILED_ESTABLISHMENT am: 787e582564

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1503434

Change-Id: I488516932223adf230a7f09f9313bbc6a2f96e2a

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, ... am: 1ccacbef6e...
Zach Johnson [Thu, 19 Nov 2020 05:44:30 +0000 (05:44 +0000)]
Merge changes I333524dc,Ia460804d,I90cfe69e,I848e344b,Ie9108602, ... am: 1ccacbef6e am: adfd9a11d9

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1498345

Change-Id: I86e010c59e25329728e0c1860810cb6393202824

3 years agoMerge changes I333524dc,Ia460804d,I90cfe69e,I848e344b,Ie9108602, ... am: 1ccacbef6e
Zach Johnson [Thu, 19 Nov 2020 05:22:29 +0000 (05:22 +0000)]
Merge changes I333524dc,Ia460804d,I90cfe69e,I848e344b,Ie9108602, ... am: 1ccacbef6e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1498345

Change-Id: I39f1c3b321ff43daad5d6cd353e50dd608799b2c

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 agoMerge "remove invalid test, restucture simple_hal_test" am: 9a230a5e0c am: ea87ea1421
Zach Johnson [Wed, 18 Nov 2020 23:28:27 +0000 (23:28 +0000)]
Merge "remove invalid test, restucture simple_hal_test" am: 9a230a5e0c am: ea87ea1421

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1497896

Change-Id: Ie4d83d43531e9082b1336182a097f9261d3934f5

3 years agoMerge "remove invalid test, restucture simple_hal_test" am: 9a230a5e0c
Zach Johnson [Wed, 18 Nov 2020 23:12:03 +0000 (23:12 +0000)]
Merge "remove invalid test, restucture simple_hal_test" am: 9a230a5e0c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1497896

Change-Id: Ic173b93e33f397c29f7cbe164289669b3fd0fec4

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 am: e42776fefe am: dfb2127ad3
Zach Johnson [Wed, 18 Nov 2020 17:40:11 +0000 (17:40 +0000)]
Merge changes I9b41e751,If93d4d62 am: e42776fefe am: dfb2127ad3

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1496803

Change-Id: I6251fc3a412e192b935a370246d704522158acb6

3 years agoMerge "RootCanal: Allow only the peer to have OOB data" am: 00bc7f3b95 am: f55ae86565
Treehugger Robot [Wed, 18 Nov 2020 17:39:50 +0000 (17:39 +0000)]
Merge "RootCanal: Allow only the peer to have OOB data" am: 00bc7f3b95 am: f55ae86565

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502353

Change-Id: I0942ffab6aed892d398f1fe09b417894e2906169

3 years agoMerge changes I9b41e751,If93d4d62 am: e42776fefe
Zach Johnson [Wed, 18 Nov 2020 17:28:32 +0000 (17:28 +0000)]
Merge changes I9b41e751,If93d4d62 am: e42776fefe

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1496803

Change-Id: Idbb83d3c4669a790d87cb67211771f23669f5289

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

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502353

Change-Id: Ie2fb5b7639f7d9a97084c6713f63f7a1705b9c63

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 agoMerge "shim: check subevent for advertising module" am: d675419563 am: 06a17beab3
Treehugger Robot [Wed, 18 Nov 2020 06:30:42 +0000 (06:30 +0000)]
Merge "shim: check subevent for advertising module" am: d675419563 am: 06a17beab3

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1498303

Change-Id: I8dde8b3162e53cd7af92988e5e26b604d89d9a3d

3 years agoMerge "shim: check subevent for advertising module" am: d675419563
Treehugger Robot [Wed, 18 Nov 2020 06:17:18 +0000 (06:17 +0000)]
Merge "shim: check subevent for advertising module" am: d675419563

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1498303

Change-Id: I326f2fd655b20bf3735df4e4879435feded83ddb

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 agoHci layer: Minor clean up am: 96ed87bb6a am: 7290083f6a
Hansong Zhang [Wed, 18 Nov 2020 03:25:50 +0000 (03:25 +0000)]
Hci layer: Minor clean up am: 96ed87bb6a am: 7290083f6a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502158

Change-Id: I05cfdc48b337d2057e892d97b0f2f1fdc4a41f3e

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 am: 96ed87bb6a
Hansong Zhang [Wed, 18 Nov 2020 03:03:21 +0000 (03:03 +0000)]
Hci layer: Minor clean up am: 96ed87bb6a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1502158

Change-Id: I6f3f3ce8d626b676990e406b6a23cb98ae3eaaf5

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_" am: 002d2025db am: 6ea19a5ec6
Chris Manton [Wed, 18 Nov 2020 01:13:56 +0000 (01:13 +0000)]
Merge "enum-ify stack/include/bt_types::BT_PSM_" am: 002d2025db am: 6ea19a5ec6

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1498681

Change-Id: Ifea11e4c76ec47caacc49cc0aefd7aa96870ab7c

3 years agoL2cap shim improvement am: b2a3ce4a4f am: 404ffb6662
Hansong Zhang [Wed, 18 Nov 2020 01:13:44 +0000 (01:13 +0000)]
L2cap shim improvement am: b2a3ce4a4f am: 404ffb6662

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1489956

Change-Id: Ia993ea348893c7f7800acf6a70817ad8c9d7fa70

3 years agoL2cap shim: Add role switch am: 505b823e81 am: 28bdd68fde
Hansong Zhang [Wed, 18 Nov 2020 01:13:32 +0000 (01:13 +0000)]
L2cap shim: Add role switch am: 505b823e81 am: 28bdd68fde

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1489355

Change-Id: I8bb61b2f50ecfdd96976ef430762add51a3d8833

3 years agoMerge "enum-ify stack/include/bt_types::BT_PSM_" am: 002d2025db
Chris Manton [Wed, 18 Nov 2020 01:12:52 +0000 (01:12 +0000)]
Merge "enum-ify stack/include/bt_types::BT_PSM_" am: 002d2025db

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1498681

Change-Id: Icdd2fed488065d28633f374daa0028afbf0d5bf5

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 am: b2a3ce4a4f
Hansong Zhang [Wed, 18 Nov 2020 00:47:53 +0000 (00:47 +0000)]
L2cap shim improvement am: b2a3ce4a4f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1489956

Change-Id: I6cdffee424b31f4a96924fb4e07b4432fafab527

3 years agoL2cap shim: Add role switch am: 505b823e81
Hansong Zhang [Wed, 18 Nov 2020 00:47:04 +0000 (00:47 +0000)]
L2cap shim: Add role switch am: 505b823e81

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1489355

Change-Id: I71e9b334e3a659c64362c3ac6ac65b3c75934167

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 agoacl: Implement ReadRemoteVersionInformation for LE am: 069cec9494 am: e79f147f94
Myles Watson [Tue, 17 Nov 2020 21:24:29 +0000 (21:24 +0000)]
acl: Implement ReadRemoteVersionInformation for LE am: 069cec9494 am: e79f147f94

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1500667

Change-Id: I5eefdcf76114a6b03ff8a0a722ae9dc32972e80f

3 years agoacl: Remove DisconnectorForLe am: c74a4365cb am: 486dfe939c
Myles Watson [Tue, 17 Nov 2020 21:24:07 +0000 (21:24 +0000)]
acl: Remove DisconnectorForLe am: c74a4365cb am: 486dfe939c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1500666

Change-Id: Ib427eb49fe1aa6056a4e1b2442c966d6402a9040

3 years agoacl: Implement ReadRemoteVersionInformation for LE am: 069cec9494
Myles Watson [Tue, 17 Nov 2020 20:51:09 +0000 (20:51 +0000)]
acl: Implement ReadRemoteVersionInformation for LE am: 069cec9494

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1500667

Change-Id: I585de35c23e7a8ddb851803c22b0254cde05274e

3 years agoacl: Remove DisconnectorForLe am: c74a4365cb
Myles Watson [Tue, 17 Nov 2020 20:50:54 +0000 (20:50 +0000)]
acl: Remove DisconnectorForLe am: c74a4365cb

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1500666

Change-Id: I6e35b8638ea8ad9def089a1781491e6fc24e57e5

3 years agoAdd AclCommands for LE and BR/EDR am: d8817d9c21 am: 46342c498a
Myles Watson [Tue, 17 Nov 2020 19:13:05 +0000 (19:13 +0000)]
Add AclCommands for LE and BR/EDR am: d8817d9c21 am: 46342c498a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1500985

Change-Id: I0b5f08556236d7494edb6ff5ac7b68f9b2fbbd6b

3 years agoAdd AclCommands for LE and BR/EDR am: d8817d9c21
Myles Watson [Tue, 17 Nov 2020 18:58:57 +0000 (18:58 +0000)]
Add AclCommands for LE and BR/EDR am: d8817d9c21

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1500985

Change-Id: I093d3c23a79a0ea9cd4de78bb8917abf544c60d1

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" am: 9e200db844 am: abf4736287
Treehugger Robot [Tue, 17 Nov 2020 07:55:25 +0000 (07:55 +0000)]
Merge "hci: Close linter IfChange block" am: 9e200db844 am: abf4736287

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1500987

Change-Id: Ibcaa1eae86cf50d9393c1135eb5b51800f5395ff

3 years agoMerge "hci: Close linter IfChange block" am: 9e200db844
Treehugger Robot [Tue, 17 Nov 2020 07:40:09 +0000 (07:40 +0000)]
Merge "hci: Close linter IfChange block" am: 9e200db844

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1500987

Change-Id: I0f32129b7bfbec89cd81867961a0c13fb0c813f1

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" am: aba2e1297f...
Treehugger Robot [Tue, 17 Nov 2020 02:02:54 +0000 (02:02 +0000)]
Merge "btaa: do not initialize btaa module if init flag set to false" am: aba2e1297f am: b5c9645969

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1500654

Change-Id: Ia685a7f101c619de25c864be493645f9c097ebcf

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

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1500654

Change-Id: Id4c226e3d843e7d321be2a4cd31141dae2613255