OSDN Git Service
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 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
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"
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
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
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
Treehugger Robot [Tue, 17 Nov 2020 07:03:43 +0000 (07:03 +0000)]
Merge "hci: 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
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
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"
Treehugger Robot [Mon, 16 Nov 2020 23:54:17 +0000 (23:54 +0000)]
Merge "btaa: null check btaa instance when receiving callback from SystemSuspend" am:
f19cd47609
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1501012
Change-Id: I94b071811ed85a3f2603eb66de2e0f83563ce725
Treehugger Robot [Mon, 16 Nov 2020 23:17:24 +0000 (23:17 +0000)]
Merge "btaa: null check btaa instance when receiving callback from SystemSuspend"
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
Treehugger Robot [Mon, 16 Nov 2020 22:07:35 +0000 (22:07 +0000)]
Merge "SecurityManager: Add CreateBondOutOfBand interface." am:
0c4fb72a70
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1500850
Change-Id: I31569cc1c325e7cea4f073c0a14317c89b4ca597
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
Treehugger Robot [Mon, 16 Nov 2020 21:52:21 +0000 (21:52 +0000)]
Merge "SecurityManager: Add CreateBondOutOfBand interface."
Treehugger Robot [Mon, 16 Nov 2020 21:30:40 +0000 (21:30 +0000)]
Merge "GD Security OobData" am:
59d606e5fd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1500610
Change-Id: I9c3a96e06ca9f5c2e4eaa10c052a6548bc7e9020
Treehugger Robot [Mon, 16 Nov 2020 21:30:32 +0000 (21:30 +0000)]
Merge changes I4386b836,I27e6b6ce,I84842b13 am:
5c2f0c233c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1500530
Change-Id: I342b15190100bea707999a1fffb87a8d4170275b
Myles Watson [Mon, 16 Nov 2020 21:30:11 +0000 (21:30 +0000)]
Merge changes I53b512b1,I1be0028c,Iabd6b355,I7d3ccb15 am:
4179e0131a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1499157
Change-Id: I7ce4415e8699ec5b8279c1facc864a572a89fb23
Zach Johnson [Mon, 16 Nov 2020 21:29:03 +0000 (21:29 +0000)]
Merge "rusty-gd: switch added services based on module under test" am:
71a9cf700d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1497017
Change-Id: I63eac6fdeca2ff7f580f47da1760ea5506a20c98
Treehugger Robot [Mon, 16 Nov 2020 21:28:49 +0000 (21:28 +0000)]
Merge "GD Security OobData"
Zach Johnson [Mon, 16 Nov 2020 21:23:44 +0000 (21:23 +0000)]
Merge "Simplify HAL protos" am:
7587b305c9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1496538
Change-Id: I82641d4b8ea06c00d3b270c4d94c256b3d8a9168
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
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.
Zach Johnson [Mon, 16 Nov 2020 20:22:59 +0000 (20:22 +0000)]
Merge "rusty-gd: switch added services based on module under test"
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
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
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
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
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
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
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
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
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
Martin Brabham [Fri, 13 Nov 2020 00:39:16 +0000 (16:39 -0800)]
HciMatchers: Add OOB Related events.
Additionally, add a useful Logger function that assisted with
solving the problem.
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I7d3ccb1593295204d09188f3a0b24b3fbdf3fe14
Zach Johnson [Mon, 16 Nov 2020 18:06:56 +0000 (18:06 +0000)]
Merge "Simplify HAL protos"
Chienyuan [Mon, 16 Nov 2020 08:47:58 +0000 (16:47 +0800)]
shim: check subevent for advertising module
Tag: #refactor
Bug:
169125803
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: I17ea246feadfebc83757e55bb6238db458bf52d4
Treehugger Robot [Mon, 16 Nov 2020 02:02:53 +0000 (02:02 +0000)]
Merge "Disable sniff for faulty remotes" am:
34140a7d4c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1496006
Change-Id: I43c037e3e81a9fa54fe032e6d79a5ad6eb218f47
Treehugger Robot [Mon, 16 Nov 2020 01:54:17 +0000 (01:54 +0000)]
Merge "Disable sniff for faulty remotes"
OSDN Git Service
