OSDN Git Service
Treehugger Robot [Fri, 19 Feb 2021 22:20:12 +0000 (22:20 +0000)]
Merge "[GD HCI] Add BtStopWatch log tag"
Treehugger Robot [Fri, 19 Feb 2021 21:47:21 +0000 (21:47 +0000)]
Merge "Fix use-after-free in async_manager.cc."
Jack He [Thu, 18 Feb 2021 21:25:44 +0000 (13:25 -0800)]
[GD HCI] Add BtStopWatch log tag
* StopWatch logs are very verbose, adding a tag so that we can
filter or disable it via config setup
Bug:
164973960
Test: make and run BT stack
Tag: #gd-refactor
Change-Id: I5cd8f24228948559ecee180fb57727469fe7eeb8
Treehugger Robot [Fri, 19 Feb 2021 18:36:11 +0000 (18:36 +0000)]
Merge "gd: Get local address from acl module for legacy SMP"
Chienyuan [Fri, 19 Feb 2021 09:19:07 +0000 (17:19 +0800)]
gd: Get local address from acl module for legacy SMP
Tag: #gd-refactor
Bug:
179452679
Test: gd/cert/run --host
Test: manual, pair LE device
Change-Id: I35e4ef614272865bd52ec66959384279705cc042
Josh Wu [Fri, 19 Feb 2021 02:54:26 +0000 (02:54 +0000)]
Merge changes I8c94b803,Ie96668df
* changes:
SCO: codec parameters refactor
HFP: Refactor HFP version flags
Chris Manton [Fri, 22 Jan 2021 17:14:20 +0000 (09:14 -0800)]
Re-include bta/ag/bta_ag_rfc.cc
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Idb7801752398c852ae1855f0812b2f6b99e5ac80
Chris Manton [Sun, 24 Jan 2021 23:49:40 +0000 (15:49 -0800)]
Re-include bta/ag/bta_ag_main.cc
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I872bd18433ab622509de50100d397fd78b28cfa4
Chris Manton [Thu, 28 Jan 2021 03:12:03 +0000 (19:12 -0800)]
Re-include bta/ag/bta_ag_cmd.cc
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I4e6871177c308eedf56050ade5b20400e35482c4
Chris Manton [Thu, 28 Jan 2021 03:07:26 +0000 (19:07 -0800)]
Re-include bta/ag/bta_ag_cfg.cc
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Ia338b436c41ff1aca7bb1f40c6029a0a041cde51
Chris Manton [Thu, 18 Feb 2021 17:00:00 +0000 (09:00 -0800)]
Re-include bta/ag/bta_ag_at.cc
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I0f6ef323bad78c04b67d96ba861c6132be793b6a
Chris Manton [Thu, 28 Jan 2021 02:59:56 +0000 (18:59 -0800)]
Re-include bta/ag/bta_ag_api.cc
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I55f3cb8055e9f126605d4976a4568256db090772
Chris Manton [Thu, 28 Jan 2021 02:56:11 +0000 (18:56 -0800)]
Re-include bta/ag/bta_ag_act.cc
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: I5f09d63761b01c9f6ce96670aa30766e42b64443
Hansong Zhang [Thu, 4 Feb 2021 22:51:18 +0000 (14:51 -0800)]
L2cap: Don't erase link when outgoing packet pending
Otherwise we will post to L2cap handler DataController::OnSdu with
deleted object.
Test: LE mouse
Bug:
179326888
Tag: #gd-refactor
Change-Id: I517ac9890cc8d3894067bcad346a80765d24aeca
Treehugger Robot [Thu, 18 Feb 2021 19:22:55 +0000 (19:22 +0000)]
Merge changes Ib334609b,Ic94f70fc
* changes:
[GD ACL] Add btsnooz support in GD
GD-Common: Add CircularBuffer::Drain() method
Treehugger Robot [Thu, 18 Feb 2021 18:21:11 +0000 (18:21 +0000)]
Merge "Rootcanal: fix typos in handling CIS"
Jack He [Thu, 18 Feb 2021 07:52:51 +0000 (23:52 -0800)]
[GD ACL] Add btsnooz support in GD
* Support in-memory btsnooz log in GD
* It uses maximum of 256KB of memory to store HCI commands, events,
L2CAP signaling channel data, and first 14 bytes of other ACL
packet
* The data is dumped to a log file when dumpsys is taken for the
Bluetooth module and when Bluetooth stack shutsdown so that
developer can debug Bluetooth issues with it
Bug:
180569201
Test: gd/cert/run
Test: bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Ib334609b0f6667846f458d2967ffa520d3af39e3
Treehugger Robot [Thu, 18 Feb 2021 07:56:25 +0000 (07:56 +0000)]
Merge "btaa: add btaa into the shim"
Jack He [Thu, 18 Feb 2021 07:44:57 +0000 (23:44 -0800)]
GD-Common: Add CircularBuffer::Drain() method
* Drain() allows a circular buffer to return and clear
its content so that one can clear a circular buffer
in-place
* Moreover, Drain() uses move semantic to avoid copying
its content and hence is more efficient
* Modify Pull() to use range-based initialization to do
blocked copy that tends to be more efficient
* Add circular buffer unit test to compilation target
and presubmit
Bug:
180569201
Test: gd/cert/run
Test: bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Ic94f70fc862f244dcdc6b9d5f2526c45d0b8eb52
Qasim Javed [Thu, 18 Feb 2021 02:53:23 +0000 (02:53 +0000)]
Merge "rusty-gd: Add missing GAP data types and fix EIR length"
Qasim Javed [Wed, 17 Feb 2021 21:39:07 +0000 (13:39 -0800)]
rusty-gd: Add missing GAP data types and fix EIR length
Devices with EIR containing Gap data type 0x10 were not showing up in
the pairing list.
Tested using Pixel Buds. They now show up in the pairing dialog. When
tapped, pairing still fails.
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I00c90b6ca4ab0bb5eca97202f7652f35260197c4
Sal Savage [Wed, 17 Feb 2021 21:01:57 +0000 (21:01 +0000)]
Merge "Add max_connected_audio_devices parameter to A2DP Sink init"
Michael Sun [Mon, 23 Nov 2020 17:51:04 +0000 (17:51 +0000)]
btaa: add btaa into the shim
Add btaa module into the shim. Implemented various helper functions.
Tag: #feature
Bug:
172501038
Test: m
Change-Id: I23b86a7b75ad301aae62d47ca34a5524a60844a1
Treehugger Robot [Wed, 17 Feb 2021 18:17:25 +0000 (18:17 +0000)]
Merge "btaa: introduce btaa module into gd"
Jakub Pawlowski [Wed, 17 Feb 2021 15:44:08 +0000 (16:44 +0100)]
Rootcanal: fix typos in handling CIS
* fix order of some badly passed parameters
* add/fix error log messages
Change-Id: Ie13580b6051a6afa15615b634d9c42ae0fd5f5d6
Jakub Pawlowski [Tue, 16 Feb 2021 22:36:20 +0000 (23:36 +0100)]
Rootcanal fix typo - return success
Test: run the not yet existing ISO tests
Change-Id: Ie3b2674336d2b97297d1be96b97351c4a82676aa
Treehugger Robot [Wed, 17 Feb 2021 00:00:08 +0000 (00:00 +0000)]
Merge "Send Bluetooth call quality report to telephony"
Haibo Huang [Tue, 16 Feb 2021 23:38:09 +0000 (23:38 +0000)]
Merge "Fix test for googletest upgrade"
Treehugger Robot [Tue, 16 Feb 2021 22:39:02 +0000 (22:39 +0000)]
Merge "Wipe cache when HID report cache isn't compatible with the current cache version."
Michael Sun [Mon, 23 Nov 2020 05:58:48 +0000 (05:58 +0000)]
btaa: introduce btaa module into gd
Introduce the btaa module skeleton implementation in gd.
Tag: #feature
Bug:
172501038
Test: mmma -j system/bt
Change-Id: I7fa28e8ef5eb25ff08b96ab7b43a2526359450f8
Johanna Ye [Tue, 16 Feb 2021 13:10:55 +0000 (14:10 +0100)]
Wipe cache when HID report cache isn't compatible with the current cache version.
This is to fix a big triggered by the OTA from any previous version to S
due to the structure change of the cache report entries.
Also corrected minor typos in documentation.
Tag: #stability
Test: Bond with HID device, upgrade from Q to S, verify device is
working.
Bug:
178874105
Bug:
159868059
Change-Id: Ibbd5da90892a637ffe8ff09b2b98bfc9fe3fb0cd
Haibo Huang [Tue, 9 Feb 2021 18:47:25 +0000 (10:47 -0800)]
Fix test for googletest upgrade
bluetooth::hci::Address conflicts with testing::Address. Move the whole
test out of testing namespace.
Tag: refactor
Test: build
Change-Id: I6015c426a80e1f2aeed9a7aea4856dec5bd36d16
Chris Manton [Thu, 11 Feb 2021 06:33:40 +0000 (22:33 -0800)]
Remove unneeded func stack/btm/btm_ble_bgconn::btm_ble_acceptlist_init
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ib4e759a47e947de205f680d31b25c8bb10a1f252
Chris Manton [Thu, 11 Feb 2021 06:32:05 +0000 (22:32 -0800)]
Remove unneccesary API BTM_GetAcceptlistSize
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I4df37acc3f7bfd210e48d0a892624fbffeb19bbf
Chris Manton [Tue, 16 Feb 2021 16:34:03 +0000 (08:34 -0800)]
Fix for gd_acl le connections
Bug:
173985410
Tag: #refactor
Test: gd/cert/run
Change-Id: I1040a6daced42b048c31382398b899157b235630
Chris Manton [Wed, 10 Feb 2021 02:49:18 +0000 (18:49 -0800)]
gd_acl: Add add/remove acceptlist
Also rename Accept/Ignore LeConnections
Bug:
173985410
Tag: #refactor
Test: gd/cert/run
Change-Id: I96c3d09bf86887f9fdff9fb09475c909f0045f02
Chris Manton [Wed, 10 Feb 2021 21:02:15 +0000 (13:02 -0800)]
Enum-ify bta/include/bta_hh_api::tBTA_HH_STATUS
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ifb26c5df247705f6e2661a3c32ded112ded71aab
Chris Manton [Wed, 10 Feb 2021 02:50:06 +0000 (18:50 -0800)]
Re-log stack/btm/btm_sec::btm_sec_is_a_bonded_dev
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I56db3d0f6676102c40e6ad1361ea59277acfe6fe
Chris Manton [Wed, 10 Feb 2021 02:49:56 +0000 (18:49 -0800)]
Re-log stack/btm/btm_ble_privacy::btm_ble_suspend_resolving_list_activity
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I6086e0ac0a2487ce3b871d3cc117fbc2a858497c
Chris Manton [Wed, 10 Feb 2021 02:49:43 +0000 (18:49 -0800)]
Re-log stack/btm/btm_ble_gap::btm_ble_update_mode_operation
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I0b04060b0fa827f1ae0499858eac115fba12034c
Chris Manton [Wed, 10 Feb 2021 02:49:01 +0000 (18:49 -0800)]
Use proper types tHCI_STATUS
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I2ae7248a2503fad7ef22c08ca09b43fcbf877cbf
Chris Manton [Wed, 10 Feb 2021 02:48:06 +0000 (18:48 -0800)]
Re-log stack/smp/smp_l2c::smp_connect_callback
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Id6f73034d4ccdecc2679c9f25bbb380ed5070d18
Chris Manton [Tue, 9 Feb 2021 22:39:32 +0000 (14:39 -0800)]
gd_acl: Assert on paths when gd_acl enabled
Towards behaving code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I8947c15a840166ad61ec91607e915d9270ea2a5b
Chris Manton [Tue, 9 Feb 2021 22:39:12 +0000 (14:39 -0800)]
Re-layout stack/btm/btm_ble_bgconn.cc
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ia9f8c2fb14b15669b5a744ad5eaee45c1b955481
Chris Manton [Tue, 9 Feb 2021 22:39:07 +0000 (14:39 -0800)]
Re-log stack/gatt/gatt_api::GATT_Connect
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I49b368915fef7ef2c51c867cff05474874714757
Chris Manton [Tue, 9 Feb 2021 17:27:24 +0000 (09:27 -0800)]
Re-log stack/smp/smp_l2c::smp_connect_callback
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I044aaf0bb09160ef6d4d1515b5a8444eaabd7434
Chris Manton [Wed, 10 Feb 2021 18:06:32 +0000 (10:06 -0800)]
Re-log stack/gap/gap_ble::client_connect_cback
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I96161fef848f45b28883bce6df9467f14e9fec64
Chris Manton [Tue, 9 Feb 2021 17:25:20 +0000 (09:25 -0800)]
Re-log bta/gatt/bta_gattc_act::bta_gattc_close
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I26c11fde63a332b20bf7ea126bd42f0f8015d3e1
Chris Manton [Tue, 9 Feb 2021 21:35:13 +0000 (13:35 -0800)]
Group internally linked functions stack/btm/btm_ble_bgconn
Also group API functions, inclusive language
and packet length checks.
Towards readable code
Bug:
173985410
Tag: #refactor
Test: gd/cert/run
Change-Id: Iace409d2ac69364a920cfb8b2994e5e7bb6f7f13
Chris Manton [Thu, 11 Feb 2021 06:24:00 +0000 (22:24 -0800)]
Directly query controller for acceptlist size
Towards meaningful code
Bug:
173985410
Tag: #refactor
Test: gd/cert/run
Change-Id: Id6852ba6ef916aa68731c4270259430e98b432d9
Chris Manton [Fri, 12 Feb 2021 00:05:57 +0000 (16:05 -0800)]
Add API for tBTM_SEC_DEV_REC::has_ble
Bitmask or value ?
Bug:
173985410
Tag: #refactor
Test: gd/cert/run
Change-Id: I7ebe09e7e84fc368bb7aed53479f6741cd22bef7
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot [Mon, 15 Feb 2021 23:21:47 +0000 (23:21 +0000)]
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/bt"
Treehugger Robot [Mon, 15 Feb 2021 11:51:25 +0000 (11:51 +0000)]
Merge "iso/tests: Add more cases for Iso Manager"
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
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
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
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
Sonny Sasaka [Fri, 12 Feb 2021 18:31:49 +0000 (18:31 +0000)]
Merge "Remove direct dependency on libcutils"
Treehugger Robot [Fri, 12 Feb 2021 05:35:31 +0000 (05:35 +0000)]
Merge "Revert "hci: Remove SimultaneousLeHost bit""
Chen Chen [Fri, 5 Feb 2021 01:38:31 +0000 (17:38 -0800)]
Send Bluetooth call quality report to telephony
Bug:
178232343
Test: manually test the function and check log
tag: #feature
Change-Id: I3ae1db6ab670bacb06380a532f39841f6fa07994
Sal Savage [Thu, 11 Feb 2021 21:36:11 +0000 (13:36 -0800)]
Add max_connected_audio_devices parameter to A2DP Sink init
This movess us off of a hardcoded value for number of connected devices
and allows Java, through the JNI, to have input on the maximum number of
audio devices it would like to have connected. This moves A2DP Sink in
linne with A2DP Source. It will also enable easily configurable
multi-a2dp sink and avrcp controller experiences.
Tag: #refactor
Bug:
180039146
Test: atest BluetoothInstrumentationTests
Change-Id: I98b7d55d8aa53c07af6451f3d5dca529b96739fc
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
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
Peter Collingbourne [Thu, 11 Feb 2021 01:20:16 +0000 (17:20 -0800)]
Fix use-after-free in async_manager.cc.
std::condition_variable::wait_until() takes a reference
to its time_point argument, and reads it after waiting (see
external/libcxx/include/__mutex_base line 385), which means that
it's possible for the Task object containing the time_point to be
read after having been deallocated (e.g. via CancelAsyncTask). Fix
the problem by making a copy of the time_point.
Found with the help of MTE.
Bug:
135772972
Test: Verified fixed crash on fvp-eng with MTE enabled everywhere
Change-Id: I8437583bfd295e563916a87aad23b947185694bb
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
Zach Johnson [Wed, 10 Feb 2021 19:34:15 +0000 (19:34 +0000)]
Merge "rusty-gd: generate bounds checks"
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
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
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
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
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
Sonny Sasaka [Tue, 9 Feb 2021 19:54:19 +0000 (19:54 +0000)]
Merge "Update source files to build on Linux/Chrome OS"
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
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
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
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
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
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"
Sonny Sasaka [Mon, 8 Feb 2021 21:00:32 +0000 (21:00 +0000)]
Merge "Update GN files for building on Linux/Chrome OS"
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
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
Jakub Pawlowski [Mon, 8 Feb 2021 18:52:22 +0000 (18:52 +0000)]
Merge "bt: Make crypto_toolbox_for_test available on the host"
Julien Desprez [Mon, 8 Feb 2021 18:18:54 +0000 (18:18 +0000)]
Merge "Fix two bluetooth tests"
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
Ł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
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