OSDN Git Service
Zach Johnson [Mon, 23 Nov 2020 20:17:53 +0000 (20:17 +0000)]
Merge changes Ib8d0227e,I2bcd02ea am:
063b7654e9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1507896
Change-Id: I6729251b41e12e33ce7cb02fa73671d5fd2caa0a
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
Zach Johnson [Mon, 23 Nov 2020 18:24:41 +0000 (18:24 +0000)]
Merge "rusty-packets: generate sample enums and make this work end to end" am:
fbdba4beb2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1506848
Change-Id: I9d9de14fa226271ba588bef53861e196d4bd680a
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"
Łukasz Rymanowski [Mon, 23 Nov 2020 12:23:11 +0000 (12:23 +0000)]
btsnoop: Fix ISO handling am:
f00fef4647
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1508116
Change-Id: I7874466ef5bc9f9f7f5f7da3f8b3aed59450013d
Ł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
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
Zach Johnson [Sat, 21 Nov 2020 01:20:41 +0000 (01:20 +0000)]
Merge changes Ia3d9e7e3,Ie2e264e9,I8767e4f9,I78716099 am:
082ac26478
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1507681
Change-Id: I39259781baa784afa782af1a7687886742d36e12
Hansong Zhang [Sat, 21 Nov 2020 01:20:28 +0000 (01:20 +0000)]
L2cap shim flag update am:
54137c7df3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1479129
Change-Id: Ie688d7e7cee93ea873dc66d909afd82af4a98f88
Jooyung Han [Sat, 21 Nov 2020 01:19:47 +0000 (01:19 +0000)]
Merge "Use std::optional instead of std::unique_ptr" am:
fc27148179
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1501916
Change-Id: Ide143da46192f97702107451af2181a09fa3ad39
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
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
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
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
Jooyung Han [Sat, 21 Nov 2020 00:45:44 +0000 (00:45 +0000)]
Merge "Use std::optional instead of std::unique_ptr"
Myles Watson [Fri, 20 Nov 2020 21:15:58 +0000 (21:15 +0000)]
Merge changes from topic "gd_oob" am:
5873a1a92d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1506819
Change-Id: I76759eb25334a5958fd9fdbb911b5ec61ff21701
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
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
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
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
Zach Johnson [Fri, 20 Nov 2020 17:41:33 +0000 (17:41 +0000)]
Merge "rusty-packets: add rust option to switch generated packet type"
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot [Thu, 19 Nov 2020 21:42:34 +0000 (21:42 +0000)]
Merge "RootCanal: Allow both sides to have OOB data"
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Zach Johnson [Wed, 18 Nov 2020 22:09:19 +0000 (22:09 +0000)]
Merge "remove invalid test, restucture simple_hal_test"
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
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
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
Treehugger Robot [Wed, 18 Nov 2020 17:08:57 +0000 (17:08 +0000)]
Merge "RootCanal: Allow only the peer to have OOB data"
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
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
Treehugger Robot [Wed, 18 Nov 2020 05:56:49 +0000 (05:56 +0000)]
Merge "shim: check subevent for advertising module"
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
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
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
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
Chris Manton [Wed, 18 Nov 2020 00:50:23 +0000 (00:50 +0000)]
Merge "enum-ify stack/include/bt_types::BT_PSM_"
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
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
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
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
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
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
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
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
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
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
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
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
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
OSDN Git Service
