OSDN Git Service

android-x86/system-bt.git
3 years agoMerge changes I23c831a6,I6a637b5e,I5a52498a,I69d5dff4,Ieb002c78 am: e53c3a7a12
Treehugger Robot [Tue, 1 Dec 2020 00:17:48 +0000 (00:17 +0000)]
Merge changes I23c831a6,I6a637b5e,I5a52498a,I69d5dff4,Ieb002c78 am: e53c3a7a12

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

Change-Id: I6d006f9a9b79d42edcdc4e65331883c0aa1e585d

3 years agoACL: Fix on_connection_packet_type_changed am: 341f9ff336
Hansong Zhang [Tue, 1 Dec 2020 00:15:08 +0000 (00:15 +0000)]
ACL: Fix on_connection_packet_type_changed am: 341f9ff336

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

Change-Id: I2bdd9f99dd075505ab2cdc051218ffd39a499ce1

3 years agoMerge changes I23c831a6,I6a637b5e,I5a52498a,I69d5dff4,Ieb002c78
Treehugger Robot [Mon, 30 Nov 2020 23:29:51 +0000 (23:29 +0000)]
Merge changes I23c831a6,I6a637b5e,I5a52498a,I69d5dff4,Ieb002c78

* changes:
  Add various stack/test/common/mock_
  Explicit use base::Location stack/btu/btu_hcif::
  Introduce net_test_stack_btm
  enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
  Canonicalize include files

3 years agoACL: Fix on_connection_packet_type_changed
Hansong Zhang [Mon, 30 Nov 2020 19:39:18 +0000 (11:39 -0800)]
ACL: Fix on_connection_packet_type_changed

This could happen before Connection Complete event is received from
controller.

We never did anything about it in legacy stack.
(HCI_CONN_PKT_TYPE_CHANGE_EVT is unused)

Bug: 174450658
Test: cert/run
Tag: #stability
Change-Id: Ia33dfb358988ebbd45abd66b9115e8529cf27d43

3 years agoAdd various stack/test/common/mock_
Chris Manton [Sun, 29 Nov 2020 00:01:10 +0000 (16:01 -0800)]
Add various stack/test/common/mock_

Surface area endpoints for btm modules.
Mostly generated from corresponding source.

Bug: 174401903
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I23c831a618a1875986db959a458263b08ad4b443

3 years agoExplicit use base::Location stack/btu/btu_hcif::
Chris Manton [Sat, 28 Nov 2020 17:29:56 +0000 (09:29 -0800)]
Explicit use base::Location stack/btu/btu_hcif::

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I6a637b5e2a8faec8766084f1624e5f76840d27dd

3 years agoIntroduce net_test_stack_btm
Chris Manton [Thu, 26 Nov 2020 00:38:18 +0000 (16:38 -0800)]
Introduce net_test_stack_btm

Towards testable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I5a52498ad8a19793ad38263224ebb9ab1434a7af

3 years agoenum-ify fixed_cid stack/include/l2cdefs::L2CAP_
Chris Manton [Thu, 19 Nov 2020 16:48:46 +0000 (08:48 -0800)]
enum-ify fixed_cid stack/include/l2cdefs::L2CAP_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I69d5dff4fded205bbc062066a36fa026ec48bf9e

3 years agoCanonicalize include files
Chris Manton [Fri, 27 Nov 2020 02:09:27 +0000 (18:09 -0800)]
Canonicalize include files

Altering makefiles triggers a significant rebuild of the
entire Android make system.
Altering source code does not.

Towards buildable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: Ieb002c783cdfb1d0e794cbfeed0deaa449c83609

3 years agoL2cap classic shim: Use new helper am: b17f980658
Hansong Zhang [Mon, 30 Nov 2020 21:21:21 +0000 (21:21 +0000)]
L2cap classic shim: Use new helper am: b17f980658

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

Change-Id: I8fff11f021f00ec49bf42669e45c49696e316259

3 years agoMerge "RootCanal: Use PIN pairing if no SSP" am: 8fb394e545
Treehugger Robot [Mon, 30 Nov 2020 18:47:26 +0000 (18:47 +0000)]
Merge "RootCanal: Use PIN pairing if no SSP" am: 8fb394e545

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

Change-Id: I78225ab1c235c48a664ac531ed21f4b508287486

3 years agoL2cap classic shim: Use new helper
Hansong Zhang [Fri, 20 Nov 2020 00:41:22 +0000 (16:41 -0800)]
L2cap classic shim: Use new helper

Fixes to the new shim, including thread sync, shim redirection in ACL
shim, security level settings.

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

3 years agoMerge "RootCanal: Use PIN pairing if no SSP"
Treehugger Robot [Mon, 30 Nov 2020 18:23:26 +0000 (18:23 +0000)]
Merge "RootCanal: Use PIN pairing if no SSP"

3 years agoMerge "Migrate bluetooth imports to proto_logging" am: 99bd08fc96
Treehugger Robot [Thu, 26 Nov 2020 05:20:42 +0000 (05:20 +0000)]
Merge "Migrate bluetooth imports to proto_logging" am: 99bd08fc96

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

Change-Id: Idba2fec2e521ce22bb675b6f8db0c1034fd43fa9

3 years agoMerge "Migrate bluetooth imports to proto_logging"
Treehugger Robot [Thu, 26 Nov 2020 05:13:18 +0000 (05:13 +0000)]
Merge "Migrate bluetooth imports to proto_logging"

3 years agogd HCI: Do not reset alarm when unregister_client am: a509f04a6e
Chienyuan [Thu, 26 Nov 2020 05:10:49 +0000 (05:10 +0000)]
gd HCI: Do not reset alarm when unregister_client am: a509f04a6e

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

Change-Id: I7979bb52c13be28ca69018383e852f9a2bc24fec

3 years agoRootCanal: Use PIN pairing if no SSP
Myles Watson [Wed, 25 Nov 2020 14:21:39 +0000 (06:21 -0800)]
RootCanal: Use PIN pairing if no SSP

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

3 years agogd HCI: Do not reset alarm when unregister_client
Chienyuan [Wed, 25 Nov 2020 09:31:40 +0000 (17:31 +0800)]
gd HCI: Do not reset alarm when unregister_client

Tag: #gd-refactor
Bug: 173770236
Test: cert/run --host;
Change-Id: I715bcf366db4845d6e84d88e97b95f9bd230c97d

3 years agoMerge "gd: implement APIs of Advertising for Legacy" am: 91b0f3955f
Treehugger Robot [Tue, 24 Nov 2020 22:53:16 +0000 (22:53 +0000)]
Merge "gd: implement APIs of Advertising for Legacy" am: 91b0f3955f

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

Change-Id: I35c774c0d53d11ce76a19e0532b8f1411192bf74

3 years agoMerge "gd: implement APIs of Advertising for Legacy"
Treehugger Robot [Tue, 24 Nov 2020 22:27:08 +0000 (22:27 +0000)]
Merge "gd: implement APIs of Advertising for Legacy"

3 years agoMigrate bluetooth imports to proto_logging
Jeffrey Huang [Fri, 20 Nov 2020 20:01:19 +0000 (12:01 -0800)]
Migrate bluetooth imports to proto_logging

These enums are being migrated to proto_logging to decouple atoms.proto from statsd.

Bug: 167962588
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I034d91894564010862b3bd0a4035e3e532a814b1
Merged-In: I034d91894564010862b3bd0a4035e3e532a814b1

3 years agoL2cap shim: Remove unused API am: d2aea9cd89
Hansong Zhang [Tue, 24 Nov 2020 18:48:51 +0000 (18:48 +0000)]
L2cap shim: Remove unused API am: d2aea9cd89

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

Change-Id: I375e03b00ca225282988f6c6e3637c1c7609ac0f

3 years agoL2cap shim: Remove unused API
Hansong Zhang [Fri, 20 Nov 2020 00:14:48 +0000 (16:14 -0800)]
L2cap shim: Remove unused API

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

3 years agoMerge changes I560edb20,Id8f90a59,If35e7bfc am: 910340ddc5
Zach Johnson [Tue, 24 Nov 2020 17:56:40 +0000 (17:56 +0000)]
Merge changes I560edb20,Id8f90a59,If35e7bfc am: 910340ddc5

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

Change-Id: Iddaf6dde7584e131e176b06aa1f1fe52b6f48435

3 years agoMerge changes Iac8f6a8e,I85f0dac1 am: 84a0fcd56d
Treehugger Robot [Tue, 24 Nov 2020 17:56:29 +0000 (17:56 +0000)]
Merge changes Iac8f6a8e,I85f0dac1 am: 84a0fcd56d

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

Change-Id: I405cf1ab702de675ffa86aaddb0ab74dee8de003

3 years agoMerge changes I738f2a13,Id0f99289,Iefd5b0c7,I61013efd,I6f8b8ae8, ... am: 75e431f37c
Treehugger Robot [Tue, 24 Nov 2020 17:55:35 +0000 (17:55 +0000)]
Merge changes I738f2a13,Id0f99289,Iefd5b0c7,I61013efd,I6f8b8ae8, ... am: 75e431f37c

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

Change-Id: Ied4d29f72fc339021a5fb0da43cb6d29b21c1105

3 years agoMerge changes I560edb20,Id8f90a59,If35e7bfc
Zach Johnson [Tue, 24 Nov 2020 17:20:28 +0000 (17:20 +0000)]
Merge changes I560edb20,Id8f90a59,If35e7bfc

* changes:
  rusty-gd: some tidying up in rootcanal_hal
  rusty-gd: Add cxx interop layer for the BT HIDL HAL
  eusty-gd: Add timerfd-based timing abstractions

3 years agoMerge changes Iac8f6a8e,I85f0dac1
Treehugger Robot [Tue, 24 Nov 2020 17:19:53 +0000 (17:19 +0000)]
Merge changes Iac8f6a8e,I85f0dac1

* changes:
  rusty-gd: GDDI now caches instances & allows injecting config
  rusty-gd: initial commit for GDDI

3 years agoMerge changes I738f2a13,Id0f99289,Iefd5b0c7,I61013efd,I6f8b8ae8, ...
Treehugger Robot [Tue, 24 Nov 2020 17:15:06 +0000 (17:15 +0000)]
Merge changes I738f2a13,Id0f99289,Iefd5b0c7,I61013efd,I6f8b8ae8, ...

* changes:
  acl_disconnect_after_role_switch:Check for valid acl
  enum-ify stack/gatt/gatt_int::GATT_CH_STATE
  Catch and release ignored btif gatt events
  Remove unused #def stack/include/gatt_api::GATT_CONN_FAIL_ESTABLISH
  Add LOG_DUMPSYS[_TITLE]
  gd: Add acl manager dumpsys data
  Introduce btm circular buffer history
  Add hci error code ROLE_SWITCH_FAILED
  Flush out BtaIdSysText
  Remove unused #include
  Proper const API for stack/include/bt_type::bd_features_text
  Add stack/l2cap/l2c_int::link_state_text
  Expose shim acl remote address accessors
  Re-log stack/l2cap/l2c_api::L2CA_RegisterLECoc
  Re-log stack/l2cap/l2c_api::L2CA_Register

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 "btm: Add API to check peer's 2M PHY support" am: e3f86b2b31
Jakub Pawlowski [Tue, 24 Nov 2020 09:56:53 +0000 (09:56 +0000)]
Merge "btm: Add API to check peer's 2M PHY support" am: e3f86b2b31

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

Change-Id: I7b99832132eb9c426073966d764ecb3468bf38e4

3 years agobtsnoop_net: Fix instruction for btsnoop logs am: b43585cdca
Łukasz Rymanowski [Tue, 24 Nov 2020 09:55:31 +0000 (09:55 +0000)]
btsnoop_net: Fix instruction for btsnoop logs am: b43585cdca

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

Change-Id: Ibb7b5d8df4e45f4db047d8c83557f7e7749fa76c

3 years agoMerge "btaa: undo btaa implementation is fluoride stack" am: 76555c9274
Michael Sun [Tue, 24 Nov 2020 09:53:17 +0000 (09:53 +0000)]
Merge "btaa: undo btaa implementation is fluoride stack" am: 76555c9274

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

Change-Id: Ie5f099e21d67c9552210657ab87e5ab2e5b57f22

3 years agoMerge "btm: Add API to check peer's 2M PHY support"
Jakub Pawlowski [Tue, 24 Nov 2020 08:26:58 +0000 (08:26 +0000)]
Merge "btm: Add API to check peer's 2M PHY support"

3 years agobtsnoop_net: Fix instruction for btsnoop logs
Łukasz Rymanowski [Fri, 8 May 2020 23:08:56 +0000 (01:08 +0200)]
btsnoop_net: Fix instruction for btsnoop logs

Change-Id: Ib014a39f108c7e947f0bbf589d6c3c8b15d4bb7d

3 years agoMerge "btaa: undo btaa implementation is fluoride stack"
Michael Sun [Tue, 24 Nov 2020 07:19:51 +0000 (07:19 +0000)]
Merge "btaa: undo btaa implementation is fluoride stack"

3 years agoacl_disconnect_after_role_switch:Check for valid acl
Chris Manton [Mon, 23 Nov 2020 22:54:36 +0000 (14:54 -0800)]
acl_disconnect_after_role_switch:Check for valid acl

Bug: 173763477
Test: gd/cert/run --host
Tag: #refactor

Change-Id: I738f2a13e3378bc924315eff9ef9ffb95be20af7

3 years agoenum-ify stack/gatt/gatt_int::GATT_CH_STATE
Chris Manton [Thu, 19 Nov 2020 21:57:40 +0000 (13:57 -0800)]
enum-ify stack/gatt/gatt_int::GATT_CH_STATE

Towards readable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: Id0f99289b4919211056d6565abe293b0b4eee179

3 years agoCatch and release ignored btif gatt events
Chris Manton [Thu, 12 Nov 2020 23:41:18 +0000 (15:41 -0800)]
Catch and release ignored btif gatt events

Prevents false logging errors

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: Iefd5b0c748f61f79c87d23b2da37f285b4df1a96

3 years agoRemove unused #def stack/include/gatt_api::GATT_CONN_FAIL_ESTABLISH
Chris Manton [Wed, 18 Nov 2020 20:58:39 +0000 (12:58 -0800)]
Remove unused #def stack/include/gatt_api::GATT_CONN_FAIL_ESTABLISH

Towards readable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I61013efd964bffd125990fe3031a58fa8a3a68a3

3 years agoAdd LOG_DUMPSYS[_TITLE]
Chris Manton [Sun, 22 Nov 2020 22:48:52 +0000 (14:48 -0800)]
Add LOG_DUMPSYS[_TITLE]

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: I6f8b8ae83c220324c5f99ce1f06178c13803913d

3 years agogd: Add acl manager dumpsys data
Chris Manton [Sun, 22 Nov 2020 02:58:55 +0000 (18:58 -0800)]
gd: Add acl manager dumpsys data

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: I4f47237754a9d16d1653f24a9d223b2a42f97543

3 years agoIntroduce btm circular buffer history
Chris Manton [Mon, 23 Nov 2020 23:23:38 +0000 (15:23 -0800)]
Introduce btm circular buffer history

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: If9ed3213f8a8a96a1ea5d6ad530c7952bf312346

3 years agoAdd hci error code ROLE_SWITCH_FAILED
Chris Manton [Mon, 23 Nov 2020 23:08:30 +0000 (15:08 -0800)]
Add hci error code ROLE_SWITCH_FAILED

Seen in the wild with Bose soundtouch

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I29007526787876f148d664d95ffadaa5e52551d0

3 years agoFlush out BtaIdSysText
Chris Manton [Mon, 23 Nov 2020 22:54:26 +0000 (14:54 -0800)]
Flush out BtaIdSysText

All active bta services seen in the wild

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: Ifafad64e23013bac9f2df1ef13292549bbd13404

3 years agoRemove unused #include
Chris Manton [Sun, 22 Nov 2020 22:48:32 +0000 (14:48 -0800)]
Remove unused #include

Toward readable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: I0c1262f796c633242313fd7b507d315ebfc618d3

3 years agoProper const API for stack/include/bt_type::bd_features_text
Chris Manton [Sun, 22 Nov 2020 17:00:47 +0000 (09:00 -0800)]
Proper const API for stack/include/bt_type::bd_features_text

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I2d9700ce398963bfe90602d995ea4faedf082329

3 years agoAdd stack/l2cap/l2c_int::link_state_text
Chris Manton [Fri, 20 Nov 2020 20:31:46 +0000 (12:31 -0800)]
Add stack/l2cap/l2c_int::link_state_text

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: If32f14beece68e85f7cbf345a3f694c1f2553bdb

3 years agoExpose shim acl remote address accessors
Chris Manton [Mon, 23 Nov 2020 05:30:59 +0000 (21:30 -0800)]
Expose shim acl remote address accessors

Bug: 166280067
Test: gd/cert/run --host
Tag: #refactor

Change-Id: Icb1d16d5982f065faf88edd19c8b6e1880546d48

3 years agoRe-log stack/l2cap/l2c_api::L2CA_RegisterLECoc
Chris Manton [Sat, 14 Nov 2020 00:38:01 +0000 (16:38 -0800)]
Re-log stack/l2cap/l2c_api::L2CA_RegisterLECoc

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: Ifd0cf6aff270624dfe5968b02ffe58f8994d823f

3 years agoRe-log stack/l2cap/l2c_api::L2CA_Register
Chris Manton [Sat, 14 Nov 2020 00:46:50 +0000 (16:46 -0800)]
Re-log stack/l2cap/l2c_api::L2CA_Register

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: I8e3f8f5e3154a03eb23fd74806424c25cbde5d25

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

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

Change-Id: Ica99e1cb212bbed6ed47d759356eb14a109ab77c

3 years agoL2cap shim: Introduce Classic Dynamic Channel Helper am: d67452503c
Hansong Zhang [Tue, 24 Nov 2020 03:44:12 +0000 (03:44 +0000)]
L2cap shim: Introduce Classic Dynamic Channel Helper am: d67452503c

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

Change-Id: Iebe4631b71642369a6aab9e2a74ed3b276b5d4b3

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 agorusty-gd: some tidying up in rootcanal_hal
Zach Johnson [Thu, 19 Nov 2020 19:08:47 +0000 (11:08 -0800)]
rusty-gd: some tidying up in rootcanal_hal

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

3 years agorusty-gd: Add cxx interop layer for the BT HIDL HAL
Zach Johnson [Thu, 19 Nov 2020 04:29:56 +0000 (20:29 -0800)]
rusty-gd: Add cxx interop layer for the BT HIDL HAL

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

3 years agoeusty-gd: Add timerfd-based timing abstractions
Zach Johnson [Wed, 18 Nov 2020 17:18:53 +0000 (09:18 -0800)]
eusty-gd: Add timerfd-based timing abstractions

Meant to feel similar to tokio's timing abstractions, but can wake the
system

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

3 years agorusty-gd: GDDI now caches instances & allows injecting config
Zach Johnson [Tue, 17 Nov 2020 05:50:49 +0000 (21:50 -0800)]
rusty-gd: GDDI now caches instances & allows injecting config

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

3 years agorusty-gd: initial commit for GDDI
Zach Johnson [Mon, 16 Nov 2020 22:43:06 +0000 (14:43 -0800)]
rusty-gd: initial commit for GDDI

go/gddi for an overview

GDDI (GD dependency injection) aims to solve the issue
of start & stop order, especially in the world where we
bring the stack up partially for testing.

this patch introduces modules & providers, but does not yet save
& remember instances to prevent multiple calls, or provide a way
to seed some object instances (e.g. config), or provide a way to
tear down the started objects

The rest is coming soon.

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

3 years agoL2cap shim namespace clean up am: 530fdc6980
Hansong Zhang [Mon, 23 Nov 2020 22:01:09 +0000 (22:01 +0000)]
L2cap shim namespace clean up am: 530fdc6980

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

Change-Id: I7decc2dc32ebbc39db16467874a3d35570574de0

3 years agoGD L2cap shim workaround am: d5f930abe8
Hansong Zhang [Mon, 23 Nov 2020 21:58:29 +0000 (21:58 +0000)]
GD L2cap shim workaround am: d5f930abe8

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

Change-Id: I76862f27bb122de28df432285f8e29228906a304

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 am: 55fc3947e9
Zach Johnson [Mon, 23 Nov 2020 21:37:05 +0000 (21:37 +0000)]
rusty-gd: properly read ACL data from the HAL am: 55fc3947e9

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

Change-Id: I4e54b30401c0c2fea8cf27e7872cae6e5b5254b4

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 am: 063b7654e9
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

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" am: fbdba4beb2
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

3 years agobtaa: undo btaa implementation is fluoride stack
Michael Sun [Mon, 23 Nov 2020 07:07:01 +0000 (07:07 +0000)]
btaa: undo btaa implementation is fluoride stack

Undo most btaa implementation in the fluoride stack to get ready for
migrating to gd.

Tag: #feature
Bug: 172501038
Test: m
Change-Id: Ibd696edd95ab4eb73ab2387114eca3af14ea66d8

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 am: f00fef4647
Ł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

3 years agobtm: Add API to check peer's 2M PHY support
Łukasz Rymanowski [Tue, 22 Sep 2020 09:53:16 +0000 (09:53 +0000)]
btm: Add API to check peer's 2M PHY support

Sponsor: jpawlowski@
Tag: #feature
Bug: 150670922
Test: compile

Change-Id: I2f0809ba14434d8c4431174aaa67ec01e9ba0788

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 agoMerge changes Ia3d9e7e3,Ie2e264e9,I8767e4f9,I78716099 am: 082ac26478
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

3 years agoL2cap shim flag update am: 54137c7df3
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

3 years agoMerge "Use std::optional instead of std::unique_ptr" am: fc27148179
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

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" am: 5873a1a92d
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

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" 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 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 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