OSDN Git Service

android-x86/system-bt.git
3 years agoMerge "btm: Add BIS related code to Iso Manager"
Jakub Pawlowski [Wed, 9 Dec 2020 17:44:55 +0000 (17:44 +0000)]
Merge "btm: Add BIS related code to Iso Manager"

3 years agoConnect main::shim::acl to legacy dumpsys operation
Chris Manton [Tue, 1 Dec 2020 22:11:43 +0000 (14:11 -0800)]
Connect main::shim::acl to legacy dumpsys operation

Toward loggable code

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

Change-Id: I5288fe8eb2f4d9308c896d5c62e99efad35a3e51

3 years agoMerge changes from topic "revert-1512686-LIHRZNOOWL"
Jeff DeCew [Fri, 4 Dec 2020 18:23:51 +0000 (18:23 +0000)]
Merge changes from topic "revert-1512686-LIHRZNOOWL"

* changes:
  Revert "rusty-gd: compile into libbluetooth"
  Revert "rusty-gd: move init_flag parsing to rust"
  Revert "rusty-gd: add stack start stubs, define shim library"

3 years agoRevert "rusty-gd: compile into libbluetooth"
Jeff DeCew [Fri, 4 Dec 2020 18:05:42 +0000 (18:05 +0000)]
Revert "rusty-gd: compile into libbluetooth"

Revert submission 1512686

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules&lkgb=7010703&lkbb=7011903&fkbb=7010786, bug b/174815635
Bug: 174815635
Reverted Changes:
I163111bc8:rusty-gd: move init_flag parsing to rust
I54cffe93d:rusty-gd: compile into libbluetooth
I5207f4df9:rusty-gd: add stack start stubs, define shim libra...

Change-Id: I0cfbe779c4cad43f92cbf0ffb1a4b9ed75205c72

3 years agoRevert "rusty-gd: move init_flag parsing to rust"
Jeff DeCew [Fri, 4 Dec 2020 18:05:42 +0000 (18:05 +0000)]
Revert "rusty-gd: move init_flag parsing to rust"

Revert submission 1512686

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules&lkgb=7010703&lkbb=7011903&fkbb=7010786, bug b/174815635
Bug: 174815635
Reverted Changes:
I163111bc8:rusty-gd: move init_flag parsing to rust
I54cffe93d:rusty-gd: compile into libbluetooth
I5207f4df9:rusty-gd: add stack start stubs, define shim libra...

Change-Id: I5740575cf7790ed1ab43cc3f521e86f4ef6966e6

3 years agoRevert "rusty-gd: add stack start stubs, define shim library"
Jeff DeCew [Fri, 4 Dec 2020 18:05:42 +0000 (18:05 +0000)]
Revert "rusty-gd: add stack start stubs, define shim library"

Revert submission 1512686

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules&lkgb=7010703&lkbb=7011903&fkbb=7010786, bug b/174815635
Bug: 174815635
Reverted Changes:
I163111bc8:rusty-gd: move init_flag parsing to rust
I54cffe93d:rusty-gd: compile into libbluetooth
I5207f4df9:rusty-gd: add stack start stubs, define shim libra...

Change-Id: I760eea76d21b768acb76b8b9dd7f58c2519e0723

3 years agoMerge changes I5207f4df,I163111bc,I54cffe93
Zach Johnson [Fri, 4 Dec 2020 00:56:48 +0000 (00:56 +0000)]
Merge changes I5207f4df,I163111bc,I54cffe93

* changes:
  rusty-gd: add stack start stubs, define shim library
  rusty-gd: move init_flag parsing to rust
  rusty-gd: compile into libbluetooth

3 years agoAdd stack::test::btm::stack_back_test::InformBtmOnConnection
Chris Manton [Sun, 29 Nov 2020 16:54:52 +0000 (08:54 -0800)]
Add stack::test::btm::stack_back_test::InformBtmOnConnection

Bug: 173769100
Test: net_test_stack_btm
Tag: #refactor

Change-Id: I4a03378bf80369d575c45cfe61345d78cabf7da2

3 years agoMerge changes Ie5e3e056,I48cd10d0,I63bd15ef,I450dc10c
Treehugger Robot [Thu, 3 Dec 2020 02:31:03 +0000 (02:31 +0000)]
Merge changes Ie5e3e056,I48cd10d0,I63bd15ef,I450dc10c

* changes:
  Propagate ACl connected through to BTA uplink
  btm: Add main/shim/acl:: connection history
  Remove unused #def main/shim/dumpsys::BOOL_TEXT
  Add bluetooth::common::StringFormatTime

3 years agoPropagate ACl connected through to BTA uplink
Chris Manton [Wed, 25 Nov 2020 20:20:24 +0000 (12:20 -0800)]
Propagate ACl connected through to BTA uplink

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

Change-Id: Ie5e3e056118dfa050fe4d90693338e4b614caac0

3 years agoMerge changes from topic "gd_passkey"
Treehugger Robot [Thu, 3 Dec 2020 02:10:00 +0000 (02:10 +0000)]
Merge changes from topic "gd_passkey"

* changes:
  PySecurity: Clarify function name
  Security Passkey: Send passkey from API to controller

3 years agoMerge changes from topic "gd_pin_code"
Treehugger Robot [Thu, 3 Dec 2020 02:04:57 +0000 (02:04 +0000)]
Merge changes from topic "gd_pin_code"

* changes:
  {Py,Cert}Security: Add function to input pin code
  Security: Add pin code methods to Ui interface

3 years agorusty-gd: add stack start stubs, define shim library
Zach Johnson [Tue, 1 Dec 2020 19:17:13 +0000 (11:17 -0800)]
rusty-gd: add stack start stubs, define shim library

to avoid duplicate symbols, all CXX FFI integrated into the native code
needs to be from a single library. Move init_flags FFI into libbt_shim
too.

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

3 years agobtm: Add main/shim/acl:: connection history
Chris Manton [Wed, 25 Nov 2020 02:38:19 +0000 (18:38 -0800)]
btm: Add main/shim/acl:: connection history

Toward loggable code

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

Change-Id: I48cd10d0d4dee8632614f9b5c74be1f33358dee2

3 years agoRemove unused #def main/shim/dumpsys::BOOL_TEXT
Chris Manton [Wed, 2 Dec 2020 22:29:06 +0000 (14:29 -0800)]
Remove unused #def main/shim/dumpsys::BOOL_TEXT

Use bluetooth::common::ToString(bool)

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

Change-Id: I63bd15efd2177ccd4705d27cda4a171215963290

3 years agoAdd bluetooth::common::StringFormatTime
Chris Manton [Wed, 2 Dec 2020 22:28:55 +0000 (14:28 -0800)]
Add bluetooth::common::StringFormatTime

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

Change-Id: I450dc10c832a11899e07da372a9cc14b5bef9ee9

3 years agoL2cap shim: clean up namespace
Hansong Zhang [Tue, 1 Dec 2020 20:53:09 +0000 (12:53 -0800)]
L2cap shim: clean up namespace

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

3 years agoMerge changes Icf1a6f56,I1dad4b78,I2ac68e30,Ic7083219
Treehugger Robot [Thu, 3 Dec 2020 00:04:25 +0000 (00:04 +0000)]
Merge changes Icf1a6f56,I1dad4b78,I2ac68e30,Ic7083219

* changes:
  btm: Indicate scan start/stop
  TEST_MAPPING add net_test_stack_btm
  Land btm control block history
  Use btm_cb Init/Free

3 years agorusty-gd: move init_flag parsing to rust
Zach Johnson [Mon, 30 Nov 2020 23:13:35 +0000 (15:13 -0800)]
rusty-gd: move init_flag parsing to rust

all that macro goodness comes to life

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

3 years ago{Py,Cert}Security: Add function to input pin code
Martin Brabham [Wed, 2 Dec 2020 19:39:41 +0000 (11:39 -0800)]
{Py,Cert}Security: Add function to input pin code

Additionally, update the send_ui_callback to be internal
only.

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

3 years agoMerge "Bluetooth: AsyncFdWatcher: Fix FD leak"
Treehugger Robot [Wed, 2 Dec 2020 22:50:02 +0000 (22:50 +0000)]
Merge "Bluetooth: AsyncFdWatcher: Fix FD leak"

3 years agoPySecurity: Clarify function name
Martin Brabham [Wed, 2 Dec 2020 21:27:56 +0000 (13:27 -0800)]
PySecurity: Clarify function name

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

3 years agoSecurity Passkey: Send passkey from API to controller
Martin Brabham [Wed, 2 Dec 2020 19:45:08 +0000 (11:45 -0800)]
Security Passkey: Send passkey from API to controller

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

3 years agoSecurity: Add pin code methods to Ui interface
Martin Brabham [Tue, 1 Dec 2020 19:06:29 +0000 (11:06 -0800)]
Security: Add pin code methods to Ui interface

Provide functions to allow communication of Ui events
related to PIN Code entry.

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

3 years agorusty-gd: compile into libbluetooth
Zach Johnson [Mon, 30 Nov 2020 17:17:18 +0000 (09:17 -0800)]
rusty-gd: compile into libbluetooth

adds init flag entry point, currently prints flags

disable the BT apex since it's not shipped yet (won't be for a while)
and there are a bajillion rust libraries we'd need to add apex
availibility to.

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

3 years agobtm: Indicate scan start/stop
Chris Manton [Wed, 25 Nov 2020 04:14:57 +0000 (20:14 -0800)]
btm: Indicate scan start/stop

Toward loggable code

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

Change-Id: Icf1a6f564dc07bf2a530b663f69dcd019bca8903

3 years agoTEST_MAPPING add net_test_stack_btm
Chris Manton [Fri, 27 Nov 2020 17:30:58 +0000 (09:30 -0800)]
TEST_MAPPING add net_test_stack_btm

Towards testable code

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

Change-Id: I1dad4b7844fe9e1ca0906a20c930244ea3e4c9bc

3 years agoLand btm control block history
Chris Manton [Wed, 25 Nov 2020 06:52:27 +0000 (22:52 -0800)]
Land btm control block history

Towards loggable code

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

Change-Id: I2ac68e3096000f77fba83cc378484e6afb7e190b

3 years agoUse btm_cb Init/Free
Chris Manton [Sun, 29 Nov 2020 17:20:56 +0000 (09:20 -0800)]
Use btm_cb Init/Free

Towards life cycle aware code

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

Change-Id: Ic7083219045de43d0363e44902ea32b633d26134

3 years agoMerge changes I4a4d6ba5,I719fad7c
Treehugger Robot [Wed, 2 Dec 2020 10:35:16 +0000 (10:35 +0000)]
Merge changes I4a4d6ba5,I719fad7c

* changes:
  Add btm control block btm_cb Init/Free()
  Re-order btm_cb init/free sequence

3 years agoMerge "Add Bluetooth LE Audio Profile (2/3)"
Jakub Pawlowski [Wed, 2 Dec 2020 08:14:59 +0000 (08:14 +0000)]
Merge "Add Bluetooth LE Audio Profile (2/3)"

3 years agoMerge "gd: Implement LE read advertising physical channel tx power"
Treehugger Robot [Wed, 2 Dec 2020 07:26:07 +0000 (07:26 +0000)]
Merge "gd: Implement LE read advertising physical channel tx power"

3 years agoBluetooth: AsyncFdWatcher: Fix FD leak
Peng Qi [Tue, 22 Aug 2017 09:38:34 +0000 (17:38 +0800)]
Bluetooth: AsyncFdWatcher: Fix FD leak

AsyncFdWatcher thread notification pipe fds without close
which causes FD leak under Bluetooth on/off stress test.

Close the notification pipe fds when shut down Bluetooth.

Bug: 174630553
Test: Bluetooth on/off stress test

Change-Id: I7575adec49161f9764f0e070ef3c1043b8295a97
(cherry picked from commit 5c6da2669cea95d775b4a1ab0ddcdad4cac82671)

3 years agoAdd btm control block btm_cb Init/Free()
Chris Manton [Wed, 25 Nov 2020 19:39:44 +0000 (11:39 -0800)]
Add btm control block btm_cb Init/Free()

Towards life cycle aware code

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

Change-Id: I4a4d6ba5fddb2e6d8af89f6b17fdeaa7816dcc86

3 years agoRe-order btm_cb init/free sequence
Chris Manton [Sun, 29 Nov 2020 17:14:32 +0000 (09:14 -0800)]
Re-order btm_cb init/free sequence

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

Change-Id: I719fad7c0d5c5d3b4f2c90b0540659f351786346

3 years agoSimplify code in shim/l2c_api.cc
Hansong Zhang [Mon, 30 Nov 2020 23:36:44 +0000 (15:36 -0800)]
Simplify code in shim/l2c_api.cc

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

3 years agogd/shim/l2cap is unused
Hansong Zhang [Tue, 24 Nov 2020 21:44:49 +0000 (13:44 -0800)]
gd/shim/l2cap is unused

Use main/shim/l2c_api.cc instead.

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

3 years agogd: Implement LE read advertising physical channel tx power
Chienyuan [Wed, 2 Dec 2020 03:05:30 +0000 (11:05 +0800)]
gd: Implement LE read advertising physical channel tx power

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

3 years agoAdd privatize option for bluetooth addresses for logging
Chris Manton [Mon, 30 Nov 2020 01:05:05 +0000 (17:05 -0800)]
Add privatize option for bluetooth addresses for logging

Toward loggable code

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

Change-Id: Id568adb9f9497072a79100202501c4d207e40828

3 years agoMerge "gd: Add local/remote acl connection initiator bit"
Treehugger Robot [Wed, 2 Dec 2020 00:19:27 +0000 (00:19 +0000)]
Merge "gd: Add local/remote acl connection initiator bit"

3 years agoMerge changes Id056390a,I2997aab5
Treehugger Robot [Tue, 1 Dec 2020 23:18:21 +0000 (23:18 +0000)]
Merge changes Id056390a,I2997aab5

* changes:
  gd: Fix flaky tests of LeAdvertisingManager
  LeAddressManagerTest: Set InitFlags for testing

3 years agogd: Add local/remote acl connection initiator bit
Chris Manton [Wed, 25 Nov 2020 02:38:01 +0000 (18:38 -0800)]
gd: Add local/remote acl connection initiator bit

Report the initiator of the acl connection.

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

Change-Id: If123478fd271f9f49ff9a3d0e30be8a9a6e1abfd

3 years agoRemove unused shim/l2cap.h and shim/l2cap.cc
Hansong Zhang [Tue, 24 Nov 2020 21:19:09 +0000 (13:19 -0800)]
Remove unused shim/l2cap.h and shim/l2cap.cc

Migrated to shim/l2c_api.cc

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

3 years agoRefactor LE dynamic psm assignment
Hansong Zhang [Tue, 24 Nov 2020 21:14:57 +0000 (13:14 -0800)]
Refactor LE dynamic psm assignment

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

3 years agoProperly route acl disconnect
Chris Manton [Wed, 25 Nov 2020 16:30:05 +0000 (08:30 -0800)]
Properly route acl disconnect

Disconnect should come directly into the acl module.

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

Change-Id: I2edaec9b29df322169b64ca1c12537af713e8c4c

3 years agoAdd stack/btm/btm_main::btm_free
Chris Manton [Fri, 27 Nov 2020 07:12:49 +0000 (23:12 -0800)]
Add stack/btm/btm_main::btm_free

Towards life cycle aware code

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

Change-Id: I71d8c1dc32b6ca3b94b5ae0c90b4134975a4e0b0

3 years agoAdd stack/btm/btm_inq::btm_inq_db_free
Chris Manton [Fri, 27 Nov 2020 07:12:18 +0000 (23:12 -0800)]
Add stack/btm/btm_inq::btm_inq_db_free

Towards life cycle aware code

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

Change-Id: I019a40e863dd2b191ba37e3ab19f932fb74016a8

3 years agoAdd stack/btm/btm_devctl::btm_dev_free
Chris Manton [Fri, 27 Nov 2020 07:11:51 +0000 (23:11 -0800)]
Add stack/btm/btm_devctl::btm_dev_free

Towards life cycle aware code

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

Change-Id: I5476c569e35242fb5079e0afecf717d55e02a64e

3 years agoMemory leak fix for osi alarm
Chris Manton [Fri, 27 Nov 2020 07:10:36 +0000 (23:10 -0800)]
Memory leak fix for osi alarm

Bug: 174399290
Test: net_test_stack_btm
Tag: #refactor

Change-Id: I473b5608b5f0e2096fa69825aa9e7f612835ff62

3 years agoMerge "Introduce net_test_stack_btm"
Treehugger Robot [Tue, 1 Dec 2020 18:30:48 +0000 (18:30 +0000)]
Merge "Introduce net_test_stack_btm"

3 years agoMerge changes Ic0e454d8,I0f324389,Id98b6ad9,Ib17a35a8
Zach Johnson [Tue, 1 Dec 2020 16:42:41 +0000 (16:42 +0000)]
Merge changes Ic0e454d8,I0f324389,Id98b6ad9,Ib17a35a8

* changes:
  rusty-gd: integrate logging
  rusty-gd: make RegistryBuilder follow the builder pattern
  rusty-gd: some tidying up of imports & formatting
  rusty-gd: swap rootcanal config to a more canonical ordering

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: Ifcd3424bf95794037d8d87d68857feef137190e7

3 years agoMerge "Update rust_protobuf proto property."
Ivan Lozano [Tue, 1 Dec 2020 13:11:57 +0000 (13:11 +0000)]
Merge "Update rust_protobuf proto property."

3 years agogd: Fix flaky tests of LeAdvertisingManager
Chienyuan [Tue, 1 Dec 2020 08:57:47 +0000 (16:57 +0800)]
gd: Fix flaky tests of LeAdvertisingManager

Bug: 174541433
Tag: #gd-refactor
Test: atest bluetooth_test_gd
Change-Id: Id056390a28e5b60d47a43ab0eaeacf44edb451fd

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: I322a51d29cc750f8a61c91f620a4dd544b3773ff

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: I6461b403d2cb0adff6f0e88bc8dd3df189e4514a

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: If792e68c92adb0431526942ac4f9274b1d1db45f

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: Ibe479c0c0d3cbe413f4c5e624a7fb69a7131d14b

3 years agoMerge "btaa: update hardware include file to be gd ready"
Treehugger Robot [Tue, 1 Dec 2020 03:50:16 +0000 (03:50 +0000)]
Merge "btaa: update hardware include file to be gd ready"

3 years agorusty-gd: integrate logging
Zach Johnson [Mon, 23 Nov 2020 17:53:59 +0000 (09:53 -0800)]
rusty-gd: integrate logging

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

3 years agorusty-gd: make RegistryBuilder follow the builder pattern
Zach Johnson [Thu, 19 Nov 2020 21:05:53 +0000 (13:05 -0800)]
rusty-gd: make RegistryBuilder follow the builder pattern

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

3 years agorusty-gd: some tidying up of imports & formatting
Zach Johnson [Thu, 19 Nov 2020 19:26:43 +0000 (11:26 -0800)]
rusty-gd: some tidying up of imports & formatting

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

3 years agorusty-gd: swap rootcanal config to a more canonical ordering
Zach Johnson [Thu, 19 Nov 2020 19:17:13 +0000 (11:17 -0800)]
rusty-gd: swap rootcanal config to a more canonical ordering

also, add helper to tidy up creating a socket addr from it

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

3 years agoMerge changes from topic "revert-1512835-CUDUBMDOSD"
Marco Ballesio [Tue, 1 Dec 2020 00:56:57 +0000 (00:56 +0000)]
Merge changes from topic "revert-1512835-CUDUBMDOSD"

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

3 years agoRevert "Canonicalize include files"
Marco Ballesio [Tue, 1 Dec 2020 00:37:48 +0000 (00:37 +0000)]
Revert "Canonicalize include files"

Revert submission 1512835

Reason for revert: DroidMonitor-triggered revert due to breakages:

https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=7002434&lkbb=7002649&fkbb=7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=7002643&lkbb=7002696&fkbb=7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=7002604&lkbb=7002703&fkbb=7002696

bug http://b/174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_

Change-Id: Id8ac53b579aa5972daaa908e7b8eed62d258d0f6

3 years agoRevert "enum-ify fixed_cid stack/include/l2cdefs::L2CAP_"
Marco Ballesio [Tue, 1 Dec 2020 00:37:48 +0000 (00:37 +0000)]
Revert "enum-ify fixed_cid stack/include/l2cdefs::L2CAP_"

Revert submission 1512835

Reason for revert: DroidMonitor-triggered revert due to breakages:

https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=7002434&lkbb=7002649&fkbb=7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=7002643&lkbb=7002696&fkbb=7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=7002604&lkbb=7002703&fkbb=7002696

bug http://b/174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_

Change-Id: Id3a41ef1f1b0ee0c75f0fd44358b929a2f39b2db

3 years agoRevert "Introduce net_test_stack_btm"
Marco Ballesio [Tue, 1 Dec 2020 00:37:48 +0000 (00:37 +0000)]
Revert "Introduce net_test_stack_btm"

Revert submission 1512835

Reason for revert: DroidMonitor-triggered revert due to breakages:

https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=7002434&lkbb=7002649&fkbb=7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=7002643&lkbb=7002696&fkbb=7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=7002604&lkbb=7002703&fkbb=7002696

bug http://b/174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_

Change-Id: Id0a3ef185f16f8e229923f684ae12d88082e4b66

3 years agoRevert "Explicit use base::Location stack/btu/btu_hcif::"
Marco Ballesio [Tue, 1 Dec 2020 00:37:48 +0000 (00:37 +0000)]
Revert "Explicit use base::Location stack/btu/btu_hcif::"

Revert submission 1512835

Reason for revert: DroidMonitor-triggered revert due to breakages:

https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=7002434&lkbb=7002649&fkbb=7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=7002643&lkbb=7002696&fkbb=7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=7002604&lkbb=7002703&fkbb=7002696

bug http://b/174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_

Change-Id: I7d8eb39fde70160b1a3dbb0e47e1b36806023543

3 years agoRevert "Add various stack/test/common/mock_"
Marco Ballesio [Tue, 1 Dec 2020 00:37:48 +0000 (00:37 +0000)]
Revert "Add various stack/test/common/mock_"

Revert submission 1512835

Reason for revert: DroidMonitor-triggered revert due to breakages:

https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=7002541&lkbb=7002623&fkbb=7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=7002434&lkbb=7002649&fkbb=7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=7002643&lkbb=7002696&fkbb=7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=7002604&lkbb=7002703&fkbb=7002696

bug http://b/174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_

Change-Id: I20453ad181475add66594787b01649f5b687ab21

3 years agoMerge "hci: Remove SimultaneousLeHost bit"
Treehugger Robot [Tue, 1 Dec 2020 00:21:50 +0000 (00:21 +0000)]
Merge "hci: Remove SimultaneousLeHost bit"

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 agohci: Remove SimultaneousLeHost bit
Myles Watson [Wed, 25 Nov 2020 14:47:16 +0000 (06:47 -0800)]
hci: Remove SimultaneousLeHost bit

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

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 agoAdd Bluetooth LE Audio Profile (2/3)
Grzegorz Kołodziejczyk [Wed, 25 Nov 2020 15:17:19 +0000 (16:17 +0100)]
Add Bluetooth LE Audio Profile (2/3)

This is boilerplate code for Bluetooth LE Audio profile

Bug: 150670922
Test: compilation
Tag: #feature
Change-Id: I5835c7b041ed1bbc8abff4b62d4324fe9a0f32fa

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 agoLeAddressManagerTest: Set InitFlags for testing
Chienyuan [Mon, 30 Nov 2020 09:14:14 +0000 (17:14 +0800)]
LeAddressManagerTest: Set InitFlags for testing

Bug: 152348535
Tag: #gd-refactor
Test: atest bluetooth_test_gd --gtest_filter=*LeAddressManagerWithSingleClientTest*
Change-Id: I2997aab586ad6583a66fae03a6644c16199089bd

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 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"
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
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 agobtaa: update hardware include file to be gd ready
Michael Sun [Mon, 23 Nov 2020 05:48:53 +0000 (05:48 +0000)]
btaa: update hardware include file to be gd ready

Move Activity enum inside ActivityAttributionCallbacks class as this
include file will not cross boundary and be available for the btaa
module within the gd. Rename the Init() function, as btaa within gd
will be modularized, hence the stack will be responsible for the
initialization.

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

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