OSDN Git Service

android-x86/system-bt.git
3 years agoReduce unneeded namespace resolution main/shim/acl
Chris Manton [Thu, 11 Feb 2021 06:02:34 +0000 (22:02 -0800)]
Reduce unneeded namespace resolution main/shim/acl

Bug: 173985410
Tag: #refactor
Test: gd/cert/run

Change-Id: Ic0587e34be24597c4ed318459817ad68aced8ebc

3 years agoIntroduce bta_test
Chris Manton [Mon, 8 Feb 2021 04:27:05 +0000 (20:27 -0800)]
Introduce bta_test

Towards testable code

Bug: 176960731
Tag: #refactor
Test: gd/cert/run

Change-Id: I653ee9dcbb63fa0d9d52f8db17e498f8820fc2dc

3 years agoIntroduce bta/test mocks and fakes
Chris Manton [Mon, 8 Feb 2021 04:26:22 +0000 (20:26 -0800)]
Introduce bta/test mocks and fakes

Towards testable code

Bug: 176960731
Tag: #refactor
Test: gd/cert/run

Change-Id: I0527f4daf7d03d12a05975fa9fd01a06bd2105e5

3 years agoRemove unnecessary include bta/hh/bta_hh_act.cc::log
Chris Manton [Mon, 8 Feb 2021 04:27:40 +0000 (20:27 -0800)]
Remove unnecessary include bta/hh/bta_hh_act.cc::log

Towards readable code

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

Change-Id: I31086a13b9c7fae16df2087b2aff7eff813a0f37

3 years agoDeclare bta/dm/bta_dm_int::deinit
Chris Manton [Mon, 8 Feb 2021 04:27:52 +0000 (20:27 -0800)]
Declare bta/dm/bta_dm_int::deinit

Towards readable code

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

Change-Id: I93271880291135b652de8299c74413874c84e653

3 years agoRe-layout stack/acl/btm_acl::btm_remove_acl
Chris Manton [Fri, 5 Feb 2021 05:47:45 +0000 (21:47 -0800)]
Re-layout stack/acl/btm_acl::btm_remove_acl

Towards readable code

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

Change-Id: Ieb9d1a0c66d45c7d500f88bcc33c355f05886ed6

3 years agobt_headless: Various updates
Chris Manton [Thu, 4 Feb 2021 21:10:04 +0000 (13:10 -0800)]
bt_headless: Various updates

Towards testable code

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

Change-Id: I21a564e868df671881428b659cf0cc81d185f94b

3 years agogd_acl: Connect gd acl shutdown
Chris Manton [Fri, 5 Feb 2021 02:34:58 +0000 (18:34 -0800)]
gd_acl: Connect gd acl shutdown

Bug: 176960731
Tag: #refactor
Test: gd/cert/run

Change-Id: I12636d06b863617255a4266956c9252095c870ba

3 years agoRe-log bta/dm/bta_dm_act::bta_dm_disable_conn_down_timer_cback
Chris Manton [Fri, 5 Feb 2021 01:15:50 +0000 (17:15 -0800)]
Re-log bta/dm/bta_dm_act::bta_dm_disable_conn_down_timer_cback

Towards loggable code

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

Change-Id: I44f957126b6d6a7760b27660c853a85b8258a0b6

3 years agoRe-log btif/src/btif_dm::BTIF_dm_disable
Chris Manton [Fri, 5 Feb 2021 01:15:40 +0000 (17:15 -0800)]
Re-log btif/src/btif_dm::BTIF_dm_disable

Towards loggable code

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

Change-Id: I89d1bc8333b41357314560d402c6723aec21d717

3 years agoRe-log stack/avdt/avdt_api::AVDT_Connect
Chris Manton [Fri, 5 Feb 2021 00:11:40 +0000 (16:11 -0800)]
Re-log stack/avdt/avdt_api::AVDT_Connect

Towards loggable code

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

Change-Id: If6422d056e24e00a65d8ef09765dc7a01dc61019

3 years agoRe-log stack/avdt/avdt_api::AVDT_DisconnectReq
Chris Manton [Fri, 5 Feb 2021 00:11:23 +0000 (16:11 -0800)]
Re-log stack/avdt/avdt_api::AVDT_DisconnectReq

Towards loggable code

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

Change-Id: I1c2cc57a9cb99dbc810372bdc2fd9e371418f3c1

3 years agoEnum-ify stack/include/avdt_api::tAVDT_RESULT
Chris Manton [Fri, 5 Feb 2021 00:10:35 +0000 (16:10 -0800)]
Enum-ify stack/include/avdt_api::tAVDT_RESULT

Towards readable code

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

Change-Id: Icdb7fa8765ed2eb5ad13433d9653708e6915834d

3 years agoRe-log l2c_link_hci_conn_comp
Chris Manton [Thu, 4 Feb 2021 21:21:29 +0000 (13:21 -0800)]
Re-log l2c_link_hci_conn_comp

Towards loggable code

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

Change-Id: Ica3d22f8396437c708fea4411f5f6709df06c223

3 years agoMerge "[LSC] Add LOCAL_LICENSE_KINDS to system/bt"
Treehugger Robot [Mon, 15 Feb 2021 23:21:47 +0000 (23:21 +0000)]
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/bt"

3 years agoMerge "iso/tests: Add more cases for Iso Manager"
Treehugger Robot [Mon, 15 Feb 2021 11:51:25 +0000 (11:51 +0000)]
Merge "iso/tests: Add more cases for Iso Manager"

3 years ago[LSC] Add LOCAL_LICENSE_KINDS to system/bt
Bob Badour [Sat, 13 Feb 2021 02:05:29 +0000 (18:05 -0800)]
[LSC] Add LOCAL_LICENSE_KINDS to system/bt

Added SPDX-license-identifier-Apache-2.0 to:
  apex/Android.bp
  audio_a2dp_hw/Android.bp
  audio_bluetooth_hw/Android.bp
  audio_hal_interface/Android.bp
  audio_hearing_aid_hw/Android.bp
  binder/Android.bp
  bta/Android.bp
  btcore/Android.bp
  btif/Android.bp
  build/Android.bp
  common/Android.bp
  conf/Android.bp
  device/Android.bp
  embdrv/g722/fuzzer/Android.bp
  embdrv/sbc/Android.bp
  embdrv/sbc/decoder/Android.bp
  embdrv/sbc/encoder/Android.bp
  gd/att/Android.bp
  gd/common/Android.bp
  gd/dumpsys/Android.bp
  gd/dumpsys/bundler/Android.bp
  gd/fuzz/Android.bp
  gd/hal/Android.bp
  gd/hci/Android.bp
  gd/iso/Android.bp
  gd/l2cap/Android.bp
  gd/l2cap/fuzz/Android.bp
  gd/neighbor/Android.bp
  gd/os/Android.bp
  gd/packet/Android.bp
  gd/packet/parser/Android.bp
  gd/packet/parser/test/Android.bp
  gd/proto/Android.bp
  gd/rust/common/Android.bp
  gd/rust/facade/Android.bp
  gd/rust/gddi/Android.bp
  gd/rust/hal/Android.bp
  gd/rust/hci/Android.bp
  gd/rust/link/Android.bp
  gd/rust/main/Android.bp
  gd/rust/shim/Android.bp
  gd/security/Android.bp
  gd/security/channel/Android.bp
  gd/security/pairing/Android.bp
  gd/security/record/Android.bp
  gd/shim/Android.bp
  gd/storage/Android.bp
  hci/Android.bp
  include/Android.bp
  internal_include/Android.bp
  main/Android.bp
  main/shim/Android.bp
  osi/test/fuzzers/Android.bp
  osi/test/fuzzers/alarm/Android.bp
  osi/test/fuzzers/allocation_tracker/Android.bp
  osi/test/fuzzers/allocator/Android.bp
  osi/test/fuzzers/array/Android.bp
  osi/test/fuzzers/buffer/Android.bp
  osi/test/fuzzers/compat/Android.bp
  osi/test/fuzzers/fixed_queue/Android.bp
  osi/test/fuzzers/future/Android.bp
  osi/test/fuzzers/list/Android.bp
  osi/test/fuzzers/ringbuffer/Android.bp
  packet/Android.bp
  packet/avrcp/Android.bp
  packet/base/Android.bp
  packet/tests/fuzzers/Android.bp
  profile/avrcp/Android.bp
  profile/sdp/Android.bp
  service/Android.bp
  service/common/Android.bp
  stack/test/fuzzers/Android.bp
  stack/test/fuzzers/a2dp/Android.bp
  stack/test/fuzzers/a2dp/codec/Android.bp
  stack/test/fuzzers/sdp/Android.bp
  test/Android.bp
  test/headless/Android.bp
  test/rootcanal/Android.bp
  test/suite/Android.bp
  types/Android.bp
  udrv/Android.bp
  utils/Android.bp
  vendor_libs/Android.bp
  vendor_libs/linux/Android.bp
  vendor_libs/linux/interface/Android.bp
  vendor_libs/test_vendor_lib/Android.bp
  vendor_libs/test_vendor_lib/types/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  gd/Android.bp
  gd/crypto_toolbox/Android.bp
  stack/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-MIT legacy_unencumbered
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    legacy_unencumbered
to:
  embdrv/g722/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
to:
  osi/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I883bd6b68223a5bc77fdac89e0280993f617d6d0

3 years agoUse proper types btm_sec_dev_rec_cback_event::bt_status_t
Chris Manton [Thu, 4 Feb 2021 21:20:58 +0000 (13:20 -0800)]
Use proper types btm_sec_dev_rec_cback_event::bt_status_t

Towards readable code

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

Change-Id: I42b950a9fb804761217a35a1c489100d8132e76b

3 years agoRe-log stack/btm/btm_sec::btm_sec_connected
Chris Manton [Thu, 4 Feb 2021 21:20:41 +0000 (13:20 -0800)]
Re-log stack/btm/btm_sec::btm_sec_connected

Towards loggable code

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

Change-Id: I41ea59a249acd33ec750b1955adc25139ece9528

3 years agoAdd gd acl shim connection shutdown
Chris Manton [Thu, 4 Feb 2021 07:31:47 +0000 (23:31 -0800)]
Add gd acl shim connection shutdown

Bug: 176960731
Tag: #refactor
Test: gd/cert/run

Change-Id: I598e8a3f352a78c989cecf10eae1b00bb755fe2c

3 years agoMerge "Remove direct dependency on libcutils"
Sonny Sasaka [Fri, 12 Feb 2021 18:31:49 +0000 (18:31 +0000)]
Merge "Remove direct dependency on libcutils"

3 years agoMerge "Revert "hci: Remove SimultaneousLeHost bit""
Treehugger Robot [Fri, 12 Feb 2021 05:35:31 +0000 (05:35 +0000)]
Merge "Revert "hci: Remove SimultaneousLeHost bit""

3 years agoRevert "hci: Remove SimultaneousLeHost bit"
Myles Watson [Thu, 11 Feb 2021 23:28:01 +0000 (15:28 -0800)]
Revert "hci: Remove SimultaneousLeHost bit"

This reverts commit 09931b889fee0037510e48eb639b091041273122.

The SimultaneousLeHost bit was deprecated in version 4.1 of the
spec, but some Bluetooth chips still need it to be set.

Bug: 179958088
Test: atest bluetooth_test_gd
      observe LMP features on a Pixel 3 when using GD controller
Tag: #gd-refactor
Change-Id: Ie8f8a8c9322a6301388ba9415d998e218ef008b1

3 years agoFix bluetooth crash when no bluetooth.audio provider is present
Jakub Pawlowski [Thu, 11 Feb 2021 12:32:58 +0000 (13:32 +0100)]
Fix bluetooth crash when no bluetooth.audio provider is present

The stack does fall back to IBluetoothAudioOffload, if present, rather
than crashing.
This is observed on some GSI builds.

Bug: 179967994
Test: start Bluetooth on device without bluetooth.audio HAL
Change-Id: I2979d43a1721f5d41b3a89ec14f670b16ef0d660

3 years agoMerge changes Iec2fb8b7,If7eabc0b,I759d041c
Zach Johnson [Wed, 10 Feb 2021 21:08:08 +0000 (21:08 +0000)]
Merge changes Iec2fb8b7,If7eabc0b,I759d041c

* changes:
  rusty-gd: make sure to notify HCI shim on stack start
  rusty-gd: handle padding in sizes
  rusty-gd: give special treament to unconstrained only-children

3 years agoMerge "rusty-gd: generate bounds checks"
Zach Johnson [Wed, 10 Feb 2021 19:34:15 +0000 (19:34 +0000)]
Merge "rusty-gd: generate bounds checks"

3 years agorusty-gd: make sure to notify HCI shim on stack start
Zach Johnson [Wed, 10 Feb 2021 18:38:13 +0000 (10:38 -0800)]
rusty-gd: make sure to notify HCI shim on stack start

this way it can register for events, etc

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: Iec2fb8b7dfe67dd843cc546eec217aa688f3c629

3 years agorusty-gd: handle padding in sizes
Zach Johnson [Wed, 10 Feb 2021 06:51:10 +0000 (22:51 -0800)]
rusty-gd: handle padding in sizes

need to unroll size concatenation, to ensure padding only applies to
size contributions *before* it exists

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: If7eabc0b1f499c2168fec6df6c5e294c5672b8e4

3 years agorusty-gd: give special treament to unconstrained only-children
Zach Johnson [Wed, 10 Feb 2021 05:55:35 +0000 (21:55 -0800)]
rusty-gd: give special treament to unconstrained only-children

usually a bad thing with actual human kids :p

if a packet only has one child and that child is running around
unconstrained and causing mischief, assume we may be able to parse
remaining bytes as the child because it's the only possibility

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I759d041c602e1d96eb640a2ec911bef2b80957bb

3 years agorusty-gd: generate bounds checks
Zach Johnson [Wed, 10 Feb 2021 04:42:38 +0000 (20:42 -0800)]
rusty-gd: generate bounds checks

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I2d349518e466853a65fbbb296a0ea69e34a4a34d

3 years agobtm_sec: Fix flags
Hansong Zhang [Tue, 9 Feb 2021 08:25:03 +0000 (00:25 -0800)]
btm_sec: Fix flags

Don't say link key is authenticated yet during ConfirmReqReply. Wait for
link key notification to see the key type.

Bug: 179724475
Tag: #security
Test: headset
Change-Id: I6d380500f92c2039b469d87f2d79ee40779b10af

3 years agoMerge "Update source files to build on Linux/Chrome OS"
Sonny Sasaka [Tue, 9 Feb 2021 19:54:19 +0000 (19:54 +0000)]
Merge "Update source files to build on Linux/Chrome OS"

3 years agoMerge changes I4496bf97,I6368fd2e
Zach Johnson [Tue, 9 Feb 2021 16:26:54 +0000 (16:26 +0000)]
Merge changes I4496bf97,I6368fd2e

* changes:
  rusty-gd: some fixes to handle errors & get it somewhat working
  rusty-gd: sequence immediate message loop posts

3 years agoRemove direct dependency on libcutils
Sonny Sasaka [Tue, 9 Feb 2021 06:09:54 +0000 (22:09 -0800)]
Remove direct dependency on libcutils

libcutils is Android-specific and does not exist in Linux/Chrome OS.
This patch removes direct dependency on it and instead creates an
abstract layer called os_utils which contain separate implementations
for Android (using libcutils) and other OSes.

Bug: 176847216
Tag: #refactor
Test: atest --host bluetooth_test_common

Change-Id: Ifaebbd2baf5d3f7d638d70b3a9b97a1cb7724d10

3 years agoUpdate source files to build on Linux/Chrome OS
Sonny Sasaka [Tue, 9 Feb 2021 06:09:48 +0000 (22:09 -0800)]
Update source files to build on Linux/Chrome OS

This modifies some source files to build on Linux:
* Add missing includes
* Add Linux empty stubs for metrics

Bug: 176847216
Tag: #refactor
Test: atest --host bluetooth_test_common

Change-Id: I15c46cd9b748ddd9f7c0712b5a66b259e41cfaa1

3 years agoMerge changes I05c6fca1,I25b03d89
Zach Johnson [Tue, 9 Feb 2021 00:56:05 +0000 (00:56 +0000)]
Merge changes I05c6fca1,I25b03d89

* changes:
  rusty-gd: remaining fixes to get DirectHciTest running consistently
  blueberry: print Data as hex, to make matching to wireshark easier

3 years agorusty-gd: some fixes to handle errors & get it somewhat working
Zach Johnson [Mon, 8 Feb 2021 22:56:53 +0000 (14:56 -0800)]
rusty-gd: some fixes to handle errors & get it somewhat working

still failing to parse an incoming event

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I4496bf97eaa4903d539e80d604b0bd51d1b3dbc5

3 years agoMerge "Load bluetooth.audio HAL as either 2.0 or 2.1"
Jakub Pawlowski [Mon, 8 Feb 2021 21:23:14 +0000 (21:23 +0000)]
Merge "Load bluetooth.audio HAL as either 2.0 or 2.1"

3 years agoMerge "Update GN files for building on Linux/Chrome OS"
Sonny Sasaka [Mon, 8 Feb 2021 21:00:32 +0000 (21:00 +0000)]
Merge "Update GN files for building on Linux/Chrome OS"

3 years agoLoad bluetooth.audio HAL as either 2.0 or 2.1
Jakub Pawlowski [Wed, 3 Feb 2021 21:51:10 +0000 (22:51 +0100)]
Load bluetooth.audio HAL as either 2.0 or 2.1

Test: atest bluetooth-test-audio-hal-interface
Bug: 150670922
Change-Id: I8024901283839c9ee25db732b42f5f9c4a3e5c24

3 years agorusty-gd: sequence immediate message loop posts
Zach Johnson [Mon, 8 Feb 2021 19:34:16 +0000 (11:34 -0800)]
rusty-gd: sequence immediate message loop posts

this ensures order of operations is preserved

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I6368fd2e07e95b505ac67c3e67343ba2a488b842

3 years agoMerge "bt: Make crypto_toolbox_for_test available on the host"
Jakub Pawlowski [Mon, 8 Feb 2021 18:52:22 +0000 (18:52 +0000)]
Merge "bt: Make crypto_toolbox_for_test available on the host"

3 years agoMerge "Fix two bluetooth tests"
Julien Desprez [Mon, 8 Feb 2021 18:18:54 +0000 (18:18 +0000)]
Merge "Fix two bluetooth tests"

3 years agoAsyncManager: Shorten test time
Myles Watson [Fri, 5 Feb 2021 05:40:31 +0000 (21:40 -0800)]
AsyncManager: Shorten test time

Fixes: 179441067
Test: atest AsyncManagerSocketTest
Tag: #test-fix
Change-Id: Ib1bd321141ba3da30fc3922a8f7b56c4f40cd3ae

3 years agobt: Make crypto_toolbox_for_test available on the host
Łukasz Rymanowski [Tue, 19 Jan 2021 13:07:54 +0000 (13:07 +0000)]
bt: Make crypto_toolbox_for_test available on the host

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

Change-Id: I72815f8e9f1721c0a935920bfd055ea5ed9e25ff

3 years agorusty-gd: remaining fixes to get DirectHciTest running consistently
Zach Johnson [Mon, 8 Feb 2021 06:17:28 +0000 (22:17 -0800)]
rusty-gd: remaining fixes to get DirectHciTest running consistently

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I05c6fca13d9af2705b4ae597f6a458963c0fd53f

3 years agoblueberry: print Data as hex, to make matching to wireshark easier
Zach Johnson [Sun, 7 Feb 2021 19:22:05 +0000 (11:22 -0800)]
blueberry: print Data as hex, to make matching to wireshark easier

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

3 years agoFix two bluetooth tests
Julien Desprez [Sun, 7 Feb 2021 21:55:59 +0000 (21:55 +0000)]
Fix two bluetooth tests

Change-Id: I0c0b75e40531169b6455a6daae6b3695a85e0ea1
Test: presubmit
Bug: 179092189

3 years agoMerge "rusty-gd: Changes to make the HCI inquiry test pass"
Zach Johnson [Sun, 7 Feb 2021 19:32:11 +0000 (19:32 +0000)]
Merge "rusty-gd: Changes to make the HCI inquiry test pass"

3 years agoL2cap shim: Send config callback before register dequeue
Hansong Zhang [Thu, 4 Feb 2021 23:33:12 +0000 (15:33 -0800)]
L2cap shim: Send config callback before register dequeue

We want to let the client (AVCT) know the MTU first.  They might need to
send something without MTU available.

On AVCT side, initialize MTU as minimal L2cap MTU for now.

Bug: 179071567
Test: Speaker
Tag: #stability
Change-Id: I654c5fd302096876a3b6d245d173a735468ba949

3 years agorusty-gd: Changes to make the HCI inquiry test pass
Qasim Javed [Fri, 5 Feb 2021 05:49:50 +0000 (21:49 -0800)]
rusty-gd: Changes to make the HCI inquiry test pass

These include:

Writing count fields
Correct parsing of vectors
Using the correct offset when parsing struct fields

P.S. Also fixes the tokio panic caused by missing handling of the else
branch in the snoop HAL.

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest:test_inquiry_from_dut

Change-Id: I4bb884369d9d811c906e271c29460a3eb134a727

3 years agoMerge "btsnoop: Fix TRUE is undefined for btsnoop socket"
Treehugger Robot [Fri, 5 Feb 2021 21:17:53 +0000 (21:17 +0000)]
Merge "btsnoop: Fix TRUE is undefined for btsnoop socket"

3 years agoUpdate GN files for building on Linux/Chrome OS
Sonny Sasaka [Wed, 3 Feb 2021 19:14:56 +0000 (19:14 +0000)]
Update GN files for building on Linux/Chrome OS

* Add missing GN files
* Move test targets under use.test
* Move non-standard codec targets under use.bt_nonstandard_codecs
* Add missing source files

Bug: 177961465
Tag: #refactor
Test: atest --host bluetooth_test_common

Change-Id: Ib7ba2705b2fd53d4c4d87916e99f35e7fce6c98e

3 years agoMerge "A2DP: AAC encoder uses same value in tick interval and feeding data"
Treehugger Robot [Fri, 5 Feb 2021 17:01:24 +0000 (17:01 +0000)]
Merge "A2DP: AAC encoder uses same value in tick interval and feeding data"

3 years agoA2DP: AAC encoder uses same value in tick interval and feeding data
Cheney Ni [Fri, 5 Feb 2021 13:55:52 +0000 (21:55 +0800)]
A2DP: AAC encoder uses same value in tick interval and feeding data

The tick that AAC encoder wakes up is based on its codec configuration,
but usually is not that fixed 20 ms. The user would hear choppy sound if
using wrong values to calculate the data size, so have to correct.

Fixes: 179268075
Tag: #compatibility
Test: check the bitrate from BTSnoop and no overrun
Change-Id: Iaaddcbd305d4b5383b707b9e0d50e8fe116c043d

3 years agoMerge "rust: Refactor modules for static_lib propagation."
Ivan Lozano [Fri, 5 Feb 2021 15:53:33 +0000 (15:53 +0000)]
Merge "rust: Refactor modules for static_lib propagation."

3 years agoadd irun (interactive run)
Zach Johnson [Thu, 4 Feb 2021 22:05:52 +0000 (14:05 -0800)]
add irun (interactive run)

fire up your command list of test(s) you want to iterate on

will run to completion, and when there are changes it will rerun

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/irun --rhost
Change-Id: Ic067f70e00740bc5588bdd8b9ac334e834fdb238

3 years agoMerge "make incremental blueberry testing faster"
Zach Johnson [Thu, 4 Feb 2021 17:48:11 +0000 (17:48 +0000)]
Merge "make incremental blueberry testing faster"

3 years agorust: Refactor modules for static_lib propagation.
Ivan Lozano [Thu, 4 Feb 2021 15:06:19 +0000 (10:06 -0500)]
rust: Refactor modules for static_lib propagation.

rust_library modules now bundle their static lib dependencies. As a
result, many of these static_lib listings are no longer necessary.

This CL also includes libcxxbridge05 in libbt_common_sys_prop_cxx and
libbt_shim_ffi in libbluetooth_rust_interop, both static libraries,
to avoid having to add these to dependencies.

Test: mma
Bug: 175886967
Bug: 179122837
Change-Id: I77c53e62d19bcda7a8ace81d7c576eed383b7c87

3 years agobtsnoop: Fix TRUE is undefined for btsnoop socket
Cheney Ni [Thu, 4 Feb 2021 10:14:28 +0000 (18:14 +0800)]
btsnoop: Fix TRUE is undefined for btsnoop socket

Because TRUE / FALSE macro is moved to bt_target.h, there is no more
such definition if including only bt_types.h.

Bug: 163134718
Tag: #refactor
Test: check BTSnoop socket is running when only BT_NET_DEBUG=true
Change-Id: I7ac1d5aeaf3eb4f910cf4498fb7096b6cf4c9fe7

3 years agoMerge changes Ibc8a2e94,I04cb8753,Idf047b8d,Id55bb63f
Treehugger Robot [Thu, 4 Feb 2021 03:09:35 +0000 (03:09 +0000)]
Merge changes Ibc8a2e94,I04cb8753,Idf047b8d,Id55bb63f

* changes:
  RFCOMM: Use std map to store channel map
  AVDT: Use std map to store channel map
  Remove unused AVDT API
  Fix L2cap shim crash on shutdown

3 years agomake incremental blueberry testing faster
Zach Johnson [Thu, 4 Feb 2021 01:15:57 +0000 (17:15 -0800)]
make incremental blueberry testing faster

don't rebuild everything and unzip, instead

only build the specific targets we care about, copy them over directly
skips a lot of build time

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

3 years agoRFCOMM: Use std map to store channel map
Hansong Zhang [Thu, 4 Feb 2021 00:59:39 +0000 (16:59 -0800)]
RFCOMM: Use std map to store channel map

Instead of using legacy fixed size array

Test: Speaker
Bug: 179117950
Tag: #stability
Change-Id: Ibc8a2e947f218a6d5870cc7a9566306ddc7eb2b3

3 years agoAVDT: Use std map to store channel map
Hansong Zhang [Thu, 4 Feb 2021 00:45:45 +0000 (16:45 -0800)]
AVDT: Use std map to store channel map

Instead of using legacy fixed size array

Test: Speaker
Bug: 179117950
Tag: #stability
Change-Id: I04cb875309ed5efc14acb34bbfdc10622eabf3be

3 years agoRemove unused AVDT API
Hansong Zhang [Thu, 4 Feb 2021 00:21:15 +0000 (16:21 -0800)]
Remove unused AVDT API

Test: compile
Change-Id: Idf047b8da8f5b19402bbfc304db1e18bd69202c2

3 years agoUse proper types tHCI_STATUS/tHCI_REASON
Chris Manton [Wed, 3 Feb 2021 23:31:04 +0000 (15:31 -0800)]
Use proper types tHCI_STATUS/tHCI_REASON

Towards readable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ib8f01833a0de300b7612d584d2eae542f465f54c

3 years agoFix L2cap shim crash on shutdown
Hansong Zhang [Wed, 3 Feb 2021 23:34:15 +0000 (15:34 -0800)]
Fix L2cap shim crash on shutdown

Bug: 179110548
Test: car kit
Tag: #stability
Change-Id: Id55bb63fea32d426f65eecbaf32ed45972059d7e

3 years agoDon't fragment when ACL shim is enabled
Hansong Zhang [Wed, 3 Feb 2021 19:50:29 +0000 (11:50 -0800)]
Don't fragment when ACL shim is enabled

Tag: #refactor
Bug: 176963486
Test: PAN
Change-Id: I3c731946e3184e619922a26da9148bfae1fe9ff7

3 years agoMerge "Controller: Simplify ReadLocalSupportedCommands"
Treehugger Robot [Wed, 3 Feb 2021 21:50:31 +0000 (21:50 +0000)]
Merge "Controller: Simplify ReadLocalSupportedCommands"

3 years agobtm_loghistory: Add codec reconfig
Chris Manton [Tue, 2 Feb 2021 18:16:41 +0000 (10:16 -0800)]
btm_loghistory: Add codec reconfig

Towards loggable code

Bug: 174808695
Tag: #refactor
Test: gd/cert/run
Change-Id: Id18b467d25ab9f7e6cc4a1cd625410eb5d51ac74

3 years agoDe-friend various tACL_CB
Chris Manton [Mon, 1 Feb 2021 19:14:35 +0000 (11:14 -0800)]
De-friend various tACL_CB

Also add default initializers

Towards modular code

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

Change-Id: I79aa3045e93d157d03c75f7f5f88049b09b04124

3 years agoStreamline BTM_GetNumAclLinks and acl_get_supported_packet_types
Chris Manton [Mon, 1 Feb 2021 19:14:04 +0000 (11:14 -0800)]
Streamline BTM_GetNumAclLinks and acl_get_supported_packet_types

Towards encapsulated code

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

Change-Id: Ifb5f6853c823e35c13b997c3e44d480cc53bc89d

3 years agoMerge "HH: Remove redundant assignment"
Treehugger Robot [Wed, 3 Feb 2021 08:20:42 +0000 (08:20 +0000)]
Merge "HH: Remove redundant assignment"

3 years agoRemove unused sco initialization
Chris Manton [Mon, 1 Feb 2021 19:00:36 +0000 (11:00 -0800)]
Remove unused sco initialization

Towards meaningful code

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

Change-Id: I4b264f8e0f63d4fcd2f5f851670395e13b5f5c02

3 years agoRemove unused #defs stack/include/bt_types
Chris Manton [Sat, 30 Jan 2021 00:00:34 +0000 (16:00 -0800)]
Remove unused #defs stack/include/bt_types

Towards meaningful code

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

Change-Id: If38dd725f5ef9ecb0caf055a32d1056e9eef7909

3 years agoEnum-ify bta/include/bta_api::tBTA_PREF_ROLES
Chris Manton [Fri, 29 Jan 2021 22:01:33 +0000 (14:01 -0800)]
Enum-ify bta/include/bta_api::tBTA_PREF_ROLES

Towards loggable code

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

Change-Id: I56d20d42bd08485c2e682ae7be8fa640a9880e5f

3 years agoAdd bta/include/bta_api::preferred_role_text
Chris Manton [Fri, 29 Jan 2021 23:58:12 +0000 (15:58 -0800)]
Add bta/include/bta_api::preferred_role_text

Towards loggable code

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

Change-Id: I105d807a90ede26af7b0ef59a3a0e5b989997799

3 years agoRemove useless #def indirection bta/dm/bta_dm_act
Chris Manton [Fri, 29 Jan 2021 23:59:48 +0000 (15:59 -0800)]
Remove useless #def indirection bta/dm/bta_dm_act

Towards meaningful code

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

Change-Id: I3cde2343803de17c17425e4fbe1b4474b19f5ea6

3 years agoMove TRACE definitions into trace header file
Chris Manton [Fri, 29 Jan 2021 23:59:09 +0000 (15:59 -0800)]
Move TRACE definitions into trace header file

Towards meaningful code

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

Change-Id: Ic59357f9180baa416d8634f557a56948746c9d83

3 years agoIntroduce gd/os/log:CASE_RETURN_TEXT
Chris Manton [Fri, 29 Jan 2021 23:57:48 +0000 (15:57 -0800)]
Introduce gd/os/log:CASE_RETURN_TEXT

Towards loggable code

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

Change-Id: I2dcb01263ec78c15977b8730aab79560c2be3005

3 years agoAdd various LOG_TAG bluetooth
Chris Manton [Fri, 29 Jan 2021 22:01:13 +0000 (14:01 -0800)]
Add various LOG_TAG bluetooth

Towards loggable code

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

Change-Id: I7a507f06070008407e70079cd867d20a921458af

3 years agoMerge "L2cap scheduler: Drop packets when chennel is closed"
Treehugger Robot [Wed, 3 Feb 2021 04:41:32 +0000 (04:41 +0000)]
Merge "L2cap scheduler: Drop packets when chennel is closed"

3 years agoMerge "Fix race condition for dynamic audio buffer capabilities"
More Kuo [Wed, 3 Feb 2021 02:39:01 +0000 (02:39 +0000)]
Merge "Fix race condition for dynamic audio buffer capabilities"

3 years agoController: Simplify ReadLocalSupportedCommands
Myles Watson [Thu, 28 Jan 2021 21:10:26 +0000 (13:10 -0800)]
Controller: Simplify ReadLocalSupportedCommands

Fixes: 175422340
Test: cert/run
Tag: #gd-refactor
Change-Id: Ie32fc5511d06f3218ecca743026876db70c8bcb4

3 years agoHH: Remove redundant assignment
Myles Watson [Wed, 3 Feb 2021 01:40:47 +0000 (17:40 -0800)]
HH: Remove redundant assignment

Bug: 179111866
Test: compilation
Change-Id: Iff38f618060272c0e8fab9009a8cf6235ab03a97

3 years agoL2cap scheduler: Drop packets when chennel is closed
Hansong Zhang [Tue, 2 Feb 2021 20:20:23 +0000 (12:20 -0800)]
L2cap scheduler: Drop packets when chennel is closed

Bug: 179124160
Test: bluetooth_test_gd
Tag: #stability
Change-Id: I820f4440c91975986505deaf45647dbe21f5f601

3 years agoFix LE crash
Hansong Zhang [Tue, 2 Feb 2021 05:39:22 +0000 (21:39 -0800)]
Fix LE crash

Bug: 179102541
Tag: #gd-refactor
Test: LE mouse
Change-Id: Id817302376a1d72b4ee4845970a045bef433f6b5

3 years agoMerge "Make build tweaks to support newer libchrome"
Abhishek Pandit-Subedi [Tue, 2 Feb 2021 20:47:30 +0000 (20:47 +0000)]
Merge "Make build tweaks to support newer libchrome"

3 years agoMerge "Fix up files to compile on Linux"
Treehugger Robot [Tue, 2 Feb 2021 19:58:30 +0000 (19:58 +0000)]
Merge "Fix up files to compile on Linux"

3 years agoMerge changes I71b8d3f5,Ie360848b,I6705aa19,I58d1972a,I2e4658ca, ...
Qasim Javed [Tue, 2 Feb 2021 19:47:13 +0000 (19:47 +0000)]
Merge changes I71b8d3f5,Ie360848b,I6705aa19,I58d1972a,I2e4658ca, ...

* changes:
  rusty-gd: hci facade completes command to ACK receive
  rusty-gd: don't put payloads, the size has already been allocated
  rusty-gd: take vector sizes into account
  rusty-gd: move write_to logic to parent_def
  rusty-gd: move size field to packet gen
  rusty-gd: Write correct size and compute it once

3 years agoL2cap: Repeat config options from remote
Hansong Zhang [Mon, 1 Feb 2021 22:48:15 +0000 (14:48 -0800)]
L2cap: Repeat config options from remote

They probably need it.

Test: cert/run
Tag: #gd-refactor
Bug: 141555841
Bug: 179071567
Change-Id: I5466749fd6724f38684de5005d2a96cc598833cf

3 years agoFix L2cap LE crash
Hansong Zhang [Mon, 1 Feb 2021 22:00:11 +0000 (14:00 -0800)]
Fix L2cap LE crash

Tag: #gd-refactor
Bug: 179066870
Test: CtsVerifier
Change-Id: I61faf8aa17323b55a818eab1820d0354c84f38e9

3 years agoMerge "BluetoothAudioHAL: MTU not exceed an AVDTP packet"
Treehugger Robot [Tue, 2 Feb 2021 15:55:30 +0000 (15:55 +0000)]
Merge "BluetoothAudioHAL: MTU not exceed an AVDTP packet"

3 years agoMerge "AVDTP: static IOP database for AVDTP SUSPEND"
Cheney Ni [Tue, 2 Feb 2021 05:11:17 +0000 (05:11 +0000)]
Merge "AVDTP: static IOP database for AVDTP SUSPEND"

3 years agorusty-gd: hci facade completes command to ACK receive
Zach Johnson [Tue, 2 Feb 2021 03:19:34 +0000 (19:19 -0800)]
rusty-gd: hci facade completes command to ACK receive

do this before sending, to ensure we don't block waiting
for events that will never come (in the case of loopback)

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

3 years agorusty-gd: don't put payloads, the size has already been allocated
Zach Johnson [Tue, 2 Feb 2021 02:34:47 +0000 (18:34 -0800)]
rusty-gd: don't put payloads, the size has already been allocated

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

3 years agorusty-gd: take vector sizes into account
Zach Johnson [Tue, 2 Feb 2021 01:11:16 +0000 (17:11 -0800)]
rusty-gd: take vector sizes into account

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

3 years agoL2cap privacy shim
Hansong Zhang [Mon, 1 Feb 2021 08:35:47 +0000 (00:35 -0800)]
L2cap privacy shim

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

3 years agoFix LE link_manager_test
Hansong Zhang [Tue, 2 Feb 2021 00:29:08 +0000 (16:29 -0800)]
Fix LE link_manager_test

Test: bluetooth_test_gd
Change-Id: Id90a43214e7334b6dde0fee4014208420cb94feb

3 years agorusty-gd: move write_to logic to parent_def
Zach Johnson [Tue, 2 Feb 2021 00:25:36 +0000 (16:25 -0800)]
rusty-gd: move write_to logic to parent_def

this way it can be shared between struct & packet

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