OSDN Git Service

android-x86/system-bt.git
3 years agoPrint stopwatch log when the bluetooth HAL died. am: 1a7586dd08
weichinweng [Fri, 9 Apr 2021 02:31:23 +0000 (02:31 +0000)]
Print stopwatch log when the bluetooth HAL died. am: 1a7586dd08

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

Change-Id: I3b1392d8102c893b86d41d482f34338789dd4054

3 years agoPrint stopwatch log when the bluetooth HAL died.
weichinweng [Thu, 8 Apr 2021 09:48:39 +0000 (17:48 +0800)]
Print stopwatch log when the bluetooth HAL died.

Bug: 175754404
Test: atest BluetoothInstrumentationTests
Tag: #stability
Change-Id: I775066475cc3b14de3b613b8a3b60c34214c3703

3 years agoMerge "Update to use CXX 1.0" am: 73f77c9369
Matthew Maurer [Thu, 8 Apr 2021 20:24:19 +0000 (20:24 +0000)]
Merge "Update to use CXX 1.0" am: 73f77c9369

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

Change-Id: I7d28ba797c3340d6648e88a4a6fcb42ee9209853

3 years agoMerge "Update to use CXX 1.0"
Matthew Maurer [Thu, 8 Apr 2021 19:59:20 +0000 (19:59 +0000)]
Merge "Update to use CXX 1.0"

3 years agoMerge "Add a hint for cert tests" am: 51f099ca2c
Treehugger Robot [Thu, 8 Apr 2021 18:40:54 +0000 (18:40 +0000)]
Merge "Add a hint for cert tests" am: 51f099ca2c

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

Change-Id: I12671d4a4459848b1a03ddffcbf0345ac9e4c561

3 years agoMerge changes I3ccf85d5,I731adcff,I6f5f9cec,I9f773287,Iabf796dc, ... am: 88d3421141
Treehugger Robot [Thu, 8 Apr 2021 18:38:32 +0000 (18:38 +0000)]
Merge changes I3ccf85d5,I731adcff,I6f5f9cec,I9f773287,Iabf796dc, ... am: 88d3421141

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

Change-Id: Id7317f98f5f402f462252ca28cb328f2340d288d

3 years agoMerge "Add a hint for cert tests"
Treehugger Robot [Thu, 8 Apr 2021 18:28:09 +0000 (18:28 +0000)]
Merge "Add a hint for cert tests"

3 years agoMerge changes I3ccf85d5,I731adcff,I6f5f9cec,I9f773287,Iabf796dc, ...
Treehugger Robot [Thu, 8 Apr 2021 18:27:11 +0000 (18:27 +0000)]
Merge changes I3ccf85d5,I731adcff,I6f5f9cec,I9f773287,Iabf796dc, ...

* changes:
  Update gitignore for Cargo.lock and tags
  Use local rules for flex/bison
  Specify bt_shim_ffi dependency to bluetoothtbd
  Fix rust build in build.py
  Avoid const value_type of vector
  Guard printing PKG_CONFIG_PATH in build.py
  Add missing #include <string.h> for memcpy
  Fix packetgen outputs

3 years agoMerge "gd hci: Check credit before sending next fragment" am: 7476efe66c
Jack He [Thu, 8 Apr 2021 18:09:42 +0000 (18:09 +0000)]
Merge "gd hci: Check credit before sending next fragment" am: 7476efe66c

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

Change-Id: I6f73f3f5b9c7b7150b5b2d314d8370a450357e76

3 years agoMerge "gd hci: Check credit before sending next fragment"
Jack He [Thu, 8 Apr 2021 17:29:14 +0000 (17:29 +0000)]
Merge "gd hci: Check credit before sending next fragment"

3 years agogd hci: Check credit before sending next fragment
Chienyuan [Thu, 8 Apr 2021 07:37:19 +0000 (15:37 +0800)]
gd hci: Check credit before sending next fragment

Tag: #gd-refactor
Bug: 180870443
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Ifd2af34886a0cf40d5ca3f4fdd4869089276d919

3 years agoAdd a hint for cert tests
Myles Watson [Thu, 8 Apr 2021 00:44:36 +0000 (17:44 -0700)]
Add a hint for cert tests

Bug: 184786243
Test: cert/run
Tag: #gd-refactor
Change-Id: Ie81ce626c23016dd66c8418aeff44687d50111d5

3 years agoAdd StopWatch for Hwbinder callback function am: 4311da6596
weichinweng [Thu, 8 Apr 2021 11:40:38 +0000 (11:40 +0000)]
Add StopWatch for Hwbinder callback function am: 4311da6596

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

Change-Id: I981dce97c04d24d8ff3871fe2c5ebd8444c71551

3 years agoUpdate to use CXX 1.0
Matthew Maurer [Thu, 8 Apr 2021 08:08:26 +0000 (01:08 -0700)]
Update to use CXX 1.0

Test: m
Bug: 184799689
Tag: #refactor
Change-Id: I93c7c2e8f754501771fe13c9f30408940dfe66a6

3 years agoAdd StopWatch for Hwbinder callback function
weichinweng [Wed, 3 Mar 2021 02:19:19 +0000 (10:19 +0800)]
Add StopWatch for Hwbinder callback function

Add stopWatch feature to monitor HCI callbacks and audio client
callbacks.

Bug: 175754854
Test: atest BluetoothInstrumentationTests
Tag: #stability
Change-Id: I87b9aac85166f345629ea110653cc873ca24c079

3 years agoUpdate owners am: 63cecbe338
Hansong Zhang [Thu, 8 Apr 2021 02:03:05 +0000 (02:03 +0000)]
Update owners am: 63cecbe338

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

Change-Id: I72b5486c69e23208691879cb3ab9892891548cc5

3 years agoUpdate owners
Hansong Zhang [Wed, 7 Apr 2021 23:29:11 +0000 (16:29 -0700)]
Update owners

Test: N/A
Change-Id: Ia98b958ea7a97b7aa5a47ce3b118148adcaa5d08

3 years agoMerge "SCO: Use const reference instead of const value" am: 6d09b3f034
Treehugger Robot [Wed, 7 Apr 2021 18:40:34 +0000 (18:40 +0000)]
Merge "SCO: Use const reference instead of const value" am: 6d09b3f034

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

Change-Id: I34f75e72130639a11fe5e5c9f79a0a5102925b54

3 years agoMerge "SCO: Use const reference instead of const value"
Treehugger Robot [Wed, 7 Apr 2021 17:28:48 +0000 (17:28 +0000)]
Merge "SCO: Use const reference instead of const value"

3 years agoAdd Volume Control Profile API am: 06f084b01d
Łukasz Rymanowski [Wed, 7 Apr 2021 16:57:47 +0000 (16:57 +0000)]
Add Volume Control Profile API am: 06f084b01d

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

Change-Id: I3de8beebd36dc467fdc4fd60bd9516abb9aee135

3 years agovc: Implement Volume Control Profile am: 3578a9e806
Łukasz Rymanowski [Wed, 7 Apr 2021 16:57:42 +0000 (16:57 +0000)]
vc: Implement Volume Control Profile am: 3578a9e806

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

Change-Id: I04457c3e0dd9e5658da0385b9f53ad460a1c7df0

3 years agoAdd Volume Control Profile API
Łukasz Rymanowski [Fri, 29 Jan 2021 08:56:03 +0000 (08:56 +0000)]
Add Volume Control Profile API

Bug: 150670922
Test: compilation
Tag: #feature
Sponsor: jpawlowski@
Change-Id: I4a12847f9be7cb77d9094fd5a1a8f9c68053ad21

3 years agoSCO: Use const reference instead of const value
Jack He [Wed, 7 Apr 2021 06:02:32 +0000 (23:02 -0700)]
SCO: Use const reference instead of const value

Bug: 183476377
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I538c46eeb9cf40400f4f4ec424c4da6ae804213c

3 years ago vc: Implement Volume Control Profile
Łukasz Rymanowski [Fri, 29 Jan 2021 09:05:10 +0000 (09:05 +0000)]
 vc: Implement Volume Control Profile

 This implements basic version of VCP which allows to control Volume
 Control Service on ther remote side.

 This profile for expose only connect/disconnect/set volume

 Bug: 150670922
 Tag: #feature
 Test: atest --host bluetooth_test_vc
 Sponsor: jpawlowski@

Change-Id: Ie68c333ffece3958d68580fbfd3a86aec1186711

3 years agolegacy: Plumb gd sco conn req to legacy stack am: c39bd0957d
Chris Manton [Wed, 7 Apr 2021 08:33:16 +0000 (08:33 +0000)]
legacy: Plumb gd sco conn req to legacy stack am: c39bd0957d

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

Change-Id: I7bc8b21f606c6c56e32f4b356dca7a65587be7e5

3 years agoConst-ify btm_sco_conn_req::DEV_CLASS am: 85fb557c11
Chris Manton [Wed, 7 Apr 2021 08:32:32 +0000 (08:32 +0000)]
Const-ify btm_sco_conn_req::DEV_CLASS am: 85fb557c11

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

Change-Id: I3a3079e175bb767f5090049cd42290fa3cfce97d

3 years agoMerge "RFCOMM: Handle failed connection request" am: a2f6bff875
Treehugger Robot [Wed, 7 Apr 2021 06:46:11 +0000 (06:46 +0000)]
Merge "RFCOMM: Handle failed connection request" am: a2f6bff875

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

Change-Id: I269d56ccfe71b5304c26a92f468c9352e8cafa8b

3 years agolegacy: Plumb gd sco conn req to legacy stack
Chris Manton [Wed, 7 Apr 2021 01:12:21 +0000 (18:12 -0700)]
legacy: Plumb gd sco conn req to legacy stack

Bug: 183476377
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I79fcfcf8dde071aff0a07f5440cfdca6e0e8134e

3 years agoConst-ify btm_sco_conn_req::DEV_CLASS
Chris Manton [Wed, 7 Apr 2021 05:42:02 +0000 (22:42 -0700)]
Const-ify btm_sco_conn_req::DEV_CLASS

Bug: 183476377
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Iec78ab6a7b46837f9ab512d57b320b565d78f7cd

3 years agoMerge "RFCOMM: Handle failed connection request"
Treehugger Robot [Wed, 7 Apr 2021 06:06:49 +0000 (06:06 +0000)]
Merge "RFCOMM: Handle failed connection request"

3 years agoUpdate gitignore for Cargo.lock and tags
Abhishek Pandit-Subedi [Mon, 15 Mar 2021 20:52:05 +0000 (13:52 -0700)]
Update gitignore for Cargo.lock and tags

Bug: 176847216
Tag: #floss
Test: atest --host bluetooth_test_gd

Change-Id: I3ccf85d54493630257957a1c5182e54470bcb16f

3 years agoUse local rules for flex/bison
Abhishek Pandit-Subedi [Mon, 15 Mar 2021 20:44:51 +0000 (13:44 -0700)]
Use local rules for flex/bison

Use local flex and bison rules for the packet parser instead of
depending on the rules in common-mk. Right now, the packet parser is
using a re-entrant parser which can't be used with C++ codegen for flex.
Common-mk maintainers would like the flex code to use C++ codegen since
it is compiling the file as C++.

Bug: 176847216
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I731adcff7c966543300d2cdf1f87ef2a69b8a211

3 years agoSpecify bt_shim_ffi dependency to bluetoothtbd
Sonny Sasaka [Sat, 27 Mar 2021 05:17:53 +0000 (22:17 -0700)]
Specify bt_shim_ffi dependency to bluetoothtbd

Specifying lib bt_shim_ffi explicitly before ssl so that ssl references
can be linked from bt_shim_ffi.

Bug: 176846220
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I6f5f9cec960157559a57fe6721cd21ea0647c312

3 years agoFix rust build in build.py
Sonny Sasaka [Thu, 25 Mar 2021 14:10:47 +0000 (07:10 -0700)]
Fix rust build in build.py

This copies the rust build result to the gn output directory to be
accessible when linking from C++. Also adds an option to use crates.io
for rust crates.

Bug: 176846220
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I9f7732878a2aced6f80f363c25aff3243d34f0d5

3 years agoAvoid const value_type of vector
Sonny Sasaka [Thu, 25 Mar 2021 13:28:55 +0000 (06:28 -0700)]
Avoid const value_type of vector

This change is required to build fluoride against libstdc++.
libstdc++ asserts that: std::vector must have a non-const, non-volatile
value_type.

Bug: 176846220
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: Iabf796dc356826782b480fd01887c04a86e9708a

3 years agoGuard printing PKG_CONFIG_PATH in build.py
Sonny Sasaka [Thu, 25 Mar 2021 12:39:20 +0000 (05:39 -0700)]
Guard printing PKG_CONFIG_PATH in build.py

Bug: 176846220
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: Iba0c739a07bcfa7256ea624e2391d5cee016d2de

3 years agoAdd missing #include <string.h> for memcpy
Sonny Sasaka [Thu, 25 Mar 2021 05:46:23 +0000 (22:46 -0700)]
Add missing #include <string.h> for memcpy

Bug: 176846220
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I62b5a032c1a346a006668145407cd00f3c6bddd5

3 years agoFix packetgen outputs
Sonny Sasaka [Thu, 4 Feb 2021 06:06:18 +0000 (22:06 -0800)]
Fix packetgen outputs

This changes action_foreach() to action() to be able to control the
outputs field correctly.

Tag: #floss
Bug: 176846220
Test: atest --host bluetooth_test_gd
Change-Id: I3cc9613e5c33aa3610a542107e97c7b4667e06c4

3 years agoshim: Plumb e/sco through shim into legacy am: ace8f38d4a
Chris Manton [Wed, 7 Apr 2021 02:43:12 +0000 (02:43 +0000)]
shim: Plumb e/sco through shim into legacy am: ace8f38d4a

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

Change-Id: I70dd4894b74a2418bfbcb3e5e6d9d3e936487243

3 years agoshim: Plumb e/sco connect request am: 7c4c80e3b6
Chris Manton [Wed, 7 Apr 2021 02:42:15 +0000 (02:42 +0000)]
shim: Plumb e/sco connect request am: 7c4c80e3b6

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

Change-Id: Id02f73dfc866996382539ea4e80a5d10eb81b144

3 years agoMerge "gd: Plumb remote esco/sco connection requests through GD" am: 05f72ffbff
Chris Manton [Wed, 7 Apr 2021 00:54:26 +0000 (00:54 +0000)]
Merge "gd: Plumb remote esco/sco connection requests through GD" am: 05f72ffbff

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

Change-Id: I4b30e4d738146e125a401c65f187f023b0ea6132

3 years agoshim: Plumb e/sco through shim into legacy
Chris Manton [Tue, 6 Apr 2021 22:20:35 +0000 (15:20 -0700)]
shim: Plumb e/sco through shim into legacy

Bug: 183476377
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Id3b9e0931e17a2e376dee207af86241836e96cbb

3 years agoshim: Plumb e/sco connect request
Chris Manton [Tue, 6 Apr 2021 22:10:23 +0000 (15:10 -0700)]
shim: Plumb e/sco connect request

Bug: 183476377
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: If14d3bf2f8c632e9007fa846d514a9c3e7bbe18a

3 years agoMerge "gd: Plumb remote esco/sco connection requests through GD"
Chris Manton [Wed, 7 Apr 2021 00:39:44 +0000 (00:39 +0000)]
Merge "gd: Plumb remote esco/sco connection requests through GD"

3 years agoMerge changes from topic "bt-gd-vse" am: 814f49d73c
Myles Watson [Wed, 7 Apr 2021 00:32:18 +0000 (00:32 +0000)]
Merge changes from topic "bt-gd-vse" am: 814f49d73c

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

Change-Id: I8d8253305ddaccbc5621f7c23a41e7f08b0dde41

3 years agoMerge changes from topic "bt-gd-vse"
Myles Watson [Tue, 6 Apr 2021 23:50:54 +0000 (23:50 +0000)]
Merge changes from topic "bt-gd-vse"

* changes:
  Hci: Include 0xFF in event loops
  GD: Crash on Root Inflammation Event
  BQR: Print common BQR events
  Revert "GD HCI: Pipe VSEs up in shim layer"
  Revert "GD HCI: Support vendor specific event in GD"

3 years agogd: Plumb remote esco/sco connection requests through GD
Chris Manton [Tue, 6 Apr 2021 00:29:22 +0000 (17:29 -0700)]
gd: Plumb remote esco/sco connection requests through GD

Bug: 183476377
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ib36d3fded252a51be550510f11cc102df2277512

3 years agoHci: Include 0xFF in event loops
Myles Watson [Tue, 6 Apr 2021 17:26:20 +0000 (10:26 -0700)]
Hci: Include 0xFF in event loops

Bug: 183057550
Test: Enable VSEs
Tag: #gd-refactor
Change-Id: Ib06340af7965863343610c1b53d37d1f92c6c8da

3 years agoRFCOMM: Handle failed connection request
Chienyuan [Tue, 6 Apr 2021 12:52:16 +0000 (20:52 +0800)]
RFCOMM: Handle failed connection request

Tag: #refactor
Bug: 183672787
Test: manual
Change-Id: Iae2682b9c6b8da5a3dead2c333b8c2054be4ac30

3 years agoMerge "A2DP: Log BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED" am: 07cdb42b56
Josh Wu [Tue, 6 Apr 2021 02:11:29 +0000 (02:11 +0000)]
Merge "A2DP: Log BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED" am: 07cdb42b56

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

Change-Id: Iace2f7495dbfce74fee06bc91b95ca1a133ce82e

3 years agoMerge "A2DP: Log BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED"
Josh Wu [Tue, 6 Apr 2021 01:35:57 +0000 (01:35 +0000)]
Merge "A2DP: Log BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED"

3 years agoGD: Crash on Root Inflammation Event
Myles Watson [Sat, 3 Apr 2021 00:50:46 +0000 (17:50 -0700)]
GD: Crash on Root Inflammation Event

Use the crash timer to allow enough time for debugging logs.

Bug: 183057550
Test: Enable VSEs
Tag: #gd-refactor
Change-Id: I11d19c7fd012cd11e237bb13b84b9d77c83c1c1f

3 years agoBQR: Print common BQR events
Myles Watson [Sat, 3 Apr 2021 00:43:14 +0000 (17:43 -0700)]
BQR: Print common BQR events

Bug: 183057550
Test: Enable BQR events
Tag: #logging
Change-Id: Ibda9f7041c7f68b0bb9fff203fea556a47c12079

3 years agoRevert "GD HCI: Pipe VSEs up in shim layer"
Myles Watson [Mon, 5 Apr 2021 22:05:30 +0000 (15:05 -0700)]
Revert "GD HCI: Pipe VSEs up in shim layer"

This reverts commit e53576837aa0691199cba916b692711a41b499ba.

We prefer to keep the shim small and implement VSE
handling in btif, since it's mostly for logging.

Bug: 183057550
Test: Enable BQR events
Tag: #gd-refactor
Change-Id: I8f57c479eb57439f2ede486b645edc9b3975c25a

3 years agoRevert "GD HCI: Support vendor specific event in GD"
Myles Watson [Mon, 5 Apr 2021 21:59:17 +0000 (14:59 -0700)]
Revert "GD HCI: Support vendor specific event in GD"

This reverts commit 9462335b7fedd1579e5961a1dc8ddbfd1a4b35ed.

Bug: 183057550
Test: Enable BQR events
Tag: #gd-refactor
Change-Id: Ibb9302ae6bb9495880174a1ed8c6457a1e781027

3 years agoMerge "Do not close the fd on drop." am: aeb13ee45c
Treehugger Robot [Mon, 5 Apr 2021 20:47:24 +0000 (20:47 +0000)]
Merge "Do not close the fd on drop." am: aeb13ee45c

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

Change-Id: I94233e774bc4174cc1be46ad37e7ab7bd2cbc0b8

3 years agoMerge "Do not close the fd on drop."
Treehugger Robot [Mon, 5 Apr 2021 20:12:58 +0000 (20:12 +0000)]
Merge "Do not close the fd on drop."

3 years agoDo not close the fd on drop.
Joel Galenson [Fri, 2 Apr 2021 22:50:38 +0000 (15:50 -0700)]
Do not close the fd on drop.

The nix crate now closes the fd itself, so we cannot close it ourselves.

Test: libbt_common_inline_tests
Change-Id: I270c84ff198416ad472be86b7d9fb506e3a74232

3 years agoMerge "Correct log stack/rfcomm/rfc_mx_fsm::rfc_mx_sm_execute" am: bd09e1666f
Treehugger Robot [Fri, 2 Apr 2021 18:16:39 +0000 (18:16 +0000)]
Merge "Correct log stack/rfcomm/rfc_mx_fsm::rfc_mx_sm_execute" am: bd09e1666f

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

Change-Id: I2a29f24421ac101d0cb769c30c0e8f93e006a552

3 years agoMerge "Correct log stack/rfcomm/rfc_mx_fsm::rfc_mx_sm_execute"
Treehugger Robot [Fri, 2 Apr 2021 17:46:42 +0000 (17:46 +0000)]
Merge "Correct log stack/rfcomm/rfc_mx_fsm::rfc_mx_sm_execute"

3 years agoCorrect log stack/rfcomm/rfc_mx_fsm::rfc_mx_sm_execute
Chienyuan [Thu, 1 Apr 2021 17:43:50 +0000 (01:43 +0800)]
Correct log stack/rfcomm/rfc_mx_fsm::rfc_mx_sm_execute

Tag: #logging
Bug: 183672787
Test: manual
Change-Id: Id52a0d1c2c8ed18c79a4f48886e2b54487cc5bda

3 years agoMerge "rusty-gd: Remove CancelableTaskTracker" am: 6a00c5a536
Qasim Javed [Thu, 1 Apr 2021 20:34:35 +0000 (20:34 +0000)]
Merge "rusty-gd: Remove CancelableTaskTracker" am: 6a00c5a536

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

Change-Id: I06e5e6c1da4c7c7f5162f4e0a5723085ef68f9ea

3 years agoMerge "rusty-gd: Remove CancelableTaskTracker"
Qasim Javed [Thu, 1 Apr 2021 19:57:01 +0000 (19:57 +0000)]
Merge "rusty-gd: Remove CancelableTaskTracker"

3 years agoMerge "gd hci: Check acl connection when start round robin" am: ff86e8a812
Treehugger Robot [Thu, 1 Apr 2021 19:31:39 +0000 (19:31 +0000)]
Merge "gd hci: Check acl connection when start round robin" am: ff86e8a812

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

Change-Id: Ie76d92b3095e3d66a78674e96fdb69b06faeb3f9

3 years agoMerge "gd hci: Check acl connection when start round robin"
Treehugger Robot [Thu, 1 Apr 2021 18:34:54 +0000 (18:34 +0000)]
Merge "gd hci: Check acl connection when start round robin"

3 years agoMerge "[GD Controller] Return version info to legacy stack" am: 83a68cf92c
Treehugger Robot [Thu, 1 Apr 2021 09:04:12 +0000 (09:04 +0000)]
Merge "[GD Controller] Return version info to legacy stack" am: 83a68cf92c

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

Change-Id: I0275139b5bdf7da4009820769e86d8649d56cef8

3 years agoMerge "BluetoothAudioHAL: Don't fetch the provider without HAL version" am: 233433e76e
Cheney Ni [Thu, 1 Apr 2021 09:03:17 +0000 (09:03 +0000)]
Merge "BluetoothAudioHAL: Don't fetch the provider without HAL version" am: 233433e76e

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

Change-Id: I4f5f30d711e6dcb1df0693d9469836b62693a38c

3 years agoMerge "[GD Controller] Return version info to legacy stack"
Treehugger Robot [Thu, 1 Apr 2021 08:44:08 +0000 (08:44 +0000)]
Merge "[GD Controller] Return version info to legacy stack"

3 years agoMerge "BluetoothAudioHAL: Don't fetch the provider without HAL version"
Cheney Ni [Thu, 1 Apr 2021 08:24:34 +0000 (08:24 +0000)]
Merge "BluetoothAudioHAL: Don't fetch the provider without HAL version"

3 years agoBluetoothAudioHAL: Don't fetch the provider without HAL version
Cheney Ni [Wed, 31 Mar 2021 17:33:08 +0000 (01:33 +0800)]
BluetoothAudioHAL: Don't fetch the provider without HAL version

This fixes a native crash while enabling BT with no bluetooth.audio HAL.

Fixes: 184147199
Bug: 184147199
Tag: #stability
Test: start Bluetooth on device without bluetooth.audio HAL
Change-Id: I96974b33316a73e1c0c291b9de05400d2e842e92

3 years agogd hci: Check acl connection when start round robin
Chienyuan [Wed, 31 Mar 2021 18:06:54 +0000 (02:06 +0800)]
gd hci: Check acl connection when start round robin

Tag: #gd-refactor
Bug: 182541100
Test: gd/cert/run
Change-Id: I341fb4358e74b75bc1c6165af961c85cfc2ae739

3 years agoMerge "gd hci: Handle overflow of acl credits" am: adb139eb52
Myles Watson [Wed, 31 Mar 2021 20:54:39 +0000 (20:54 +0000)]
Merge "gd hci: Handle overflow of acl credits" am: adb139eb52

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

Change-Id: I8011397f11dea5baa5e19cdf6da10d98afa28899

3 years agoMerge "gd hci: Handle overflow of acl credits"
Myles Watson [Wed, 31 Mar 2021 20:23:51 +0000 (20:23 +0000)]
Merge "gd hci: Handle overflow of acl credits"

3 years agoMerge "A2DP: don't apply codec preference if service disabled" am: ede3dc1a48
Treehugger Robot [Wed, 31 Mar 2021 20:10:07 +0000 (20:10 +0000)]
Merge "A2DP: don't apply codec preference if service disabled" am: ede3dc1a48

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

Change-Id: Ia8942d16e21525c2bdd847ea1ffe407c74f31845

3 years agorusty-gd: Remove CancelableTaskTracker
Qasim Javed [Tue, 30 Mar 2021 20:22:55 +0000 (13:22 -0700)]
rusty-gd: Remove CancelableTaskTracker

Pairing, connection and A2DP streaming works with rusty-gd.

Also, tested with the default flags to make sure I am not breaking
anything.

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

Change-Id: I325e6aba146d9351aa7a06ab3c847cd410a502f3

3 years agoMerge "A2DP: don't apply codec preference if service disabled"
Treehugger Robot [Wed, 31 Mar 2021 19:27:35 +0000 (19:27 +0000)]
Merge "A2DP: don't apply codec preference if service disabled"

3 years agogd hci: Handle overflow of acl credits
Chienyuan [Wed, 24 Mar 2021 11:59:28 +0000 (19:59 +0800)]
gd hci: Handle overflow of acl credits

Tag: #gd-refactor
Bug: 178668450
Test: gd/cert/run
Change-Id: I3efc7a73cfbc90b876fa055b29250587c689df0c

3 years ago[GD Controller] Return version info to legacy stack
Jack He [Wed, 31 Mar 2021 09:30:13 +0000 (02:30 -0700)]
[GD Controller] Return version info to legacy stack

* Copy and return version info to legacy stack
* Support parsing BT 5.2 version info

Tag: #gd-refactor
Bug: 183349385
Test: make, A2DP streaming
Change-Id: Ic8921570000599175b9b219052f95f6c7b4035a8

3 years agoA2DP: Log BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED
Josh Wu [Wed, 24 Mar 2021 12:15:43 +0000 (20:15 +0800)]
A2DP: Log BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED

Enable BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED Result metrics logged in stack

Tag: #feature
Bug: 183473902
Test: atest BluetoothInstrumentationTests
Change-Id: I9e9b7d1d0e6fd094978ccaad9c16a0e2306e7882

3 years agoMerge "Use hci_root_inflamed_abort if received root inflamed packet" am: 3c6751a128
Treehugger Robot [Wed, 31 Mar 2021 02:17:56 +0000 (02:17 +0000)]
Merge "Use hci_root_inflamed_abort if received root inflamed packet" am: 3c6751a128

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

Change-Id: I1d3c042e38f6263e6a377a96de4724d9bbc49322

3 years agoMerge "Use hci_root_inflamed_abort if received root inflamed packet"
Treehugger Robot [Wed, 31 Mar 2021 01:49:18 +0000 (01:49 +0000)]
Merge "Use hci_root_inflamed_abort if received root inflamed packet"

3 years agoMerge "audio: Introduce client interface support for HAL 2.1" am: 052c371919
Jakub Pawlowski [Tue, 30 Mar 2021 15:26:06 +0000 (15:26 +0000)]
Merge "audio: Introduce client interface support for HAL 2.1" am: 052c371919

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

Change-Id: If793a3ad5a59ddea4f2adb48dc346c9c4aed2186

3 years agoMerge "eatt: Adjust to new L2CAP API behaviour" am: ccd8415985
Jakub Pawlowski [Tue, 30 Mar 2021 15:25:06 +0000 (15:25 +0000)]
Merge "eatt: Adjust to new L2CAP API behaviour" am: ccd8415985

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

Change-Id: Ib264254130b513f73d44abc2a92cd62215ed14f8

3 years agoMerge "audio: Introduce client interface support for HAL 2.1"
Jakub Pawlowski [Tue, 30 Mar 2021 15:14:53 +0000 (15:14 +0000)]
Merge "audio: Introduce client interface support for HAL 2.1"

3 years agoMerge "eatt: Adjust to new L2CAP API behaviour"
Jakub Pawlowski [Tue, 30 Mar 2021 14:55:19 +0000 (14:55 +0000)]
Merge "eatt: Adjust to new L2CAP API behaviour"

3 years agoeatt: Adjust to new L2CAP API behaviour
Łukasz Rymanowski [Tue, 30 Mar 2021 10:30:29 +0000 (10:30 +0000)]
eatt: Adjust to new L2CAP API behaviour

There were a changes in the L2CAP layer which needs to be taken into
account by EATT.

L2CAP calls L2CA_DisconnectInd_Cb only when channel
has been disconnected by peer and there is also no confirmation on
L2CA_DisconnectReq.

Having above in mind, EATT needs to clear its channels list just
after calling L2CA_DisconnectReq() othwerwise state of EATT will
be incorrect.

Tag: #feature
Bug: 159786353
Sponsor: jpawlowski@
Test: atest --host net_test_eatt

Change-Id: I49949ca071f40abb9ca38dcd337b4de63f493f09

3 years agoaudio: Introduce client interface support for HAL 2.1
Grzegorz Kołodziejczyk [Fri, 12 Feb 2021 17:05:03 +0000 (17:05 +0000)]
audio: Introduce client interface support for HAL 2.1

Patch introduces HAL 2.1 client interface support with backward compatibility.

Tag: #feature
Test: atest bluetooth-test-audio-hal-interface
Bug: 150670922
Sponsor: jpawlowski@
Change-Id: I4c277c48e4794d8ae615742de0d27084d23fd266

3 years agoMerge "Use proper UUID for PBAP-PCE profile descriptor list" am: f859dd1603
Sal Savage [Mon, 29 Mar 2021 19:03:18 +0000 (19:03 +0000)]
Merge "Use proper UUID for PBAP-PCE profile descriptor list" am: f859dd1603

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

Change-Id: I171cfd65c3ce3621d288828719c25692ae5da1c3

3 years agoMerge "Use proper UUID for PBAP-PCE profile descriptor list"
Sal Savage [Mon, 29 Mar 2021 18:32:36 +0000 (18:32 +0000)]
Merge "Use proper UUID for PBAP-PCE profile descriptor list"

3 years agoA2DP: don't apply codec preference if service disabled
Cheney Ni [Mon, 29 Mar 2021 07:38:59 +0000 (15:38 +0800)]
A2DP: don't apply codec preference if service disabled

Because the codec preference is saved at upper-layer, it was timing that
JNI callbacks were reset by BT turning off while querying the
preference. In order to prevent NPE, this CL checks whether A2DP is
still enabled, and uses a JNI variable to store those callbacks.

Tag: #stability
Fixes: 182756107
Test: atest net_test_btif
Change-Id: Iacfb9fee0e69a47ca7c7ed7c5fc8b4782b647f84

3 years agoMerge changes I60b334ef,I390a385c,I0a562e1b am: 7ef4e120b3
Jakub Pawlowski [Mon, 29 Mar 2021 07:15:23 +0000 (07:15 +0000)]
Merge changes I60b334ef,I390a385c,I0a562e1b am: 7ef4e120b3

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

Change-Id: Ic4fa514a3a51565b65ca8e0d53e96ac8cd10aad6

3 years agoMerge changes I60b334ef,I390a385c,I0a562e1b
Jakub Pawlowski [Mon, 29 Mar 2021 06:54:56 +0000 (06:54 +0000)]
Merge changes I60b334ef,I390a385c,I0a562e1b

* changes:
  Revert "Remove unused API BTM_IsPhy2mSupported"
  Revert "Remove unused API BTM_RequestPeerSCA"
  Revert "Remove unused API BTM_GetPeerSCA"

3 years agoUse hci_root_inflamed_abort if received root inflamed packet
weichinweng [Tue, 23 Mar 2021 09:21:42 +0000 (17:21 +0800)]
Use hci_root_inflamed_abort if received root inflamed packet

Sometimes, Since the hci_timeout_abort abort_timer triggered is faster
then the bluetooth HIDL service died, the bt_stack doesn't call
hci_root_inflamed_abort even if received root inflamed packet. Use
hci_root_inflamed_abort when HCI command timeout if it received the root
inflamed packet.

Bug: 182940721
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: I877ac13e46ac12ef42fc149a7d4a16d932f014d2

3 years agoAdd btif/include/btif_hh::btif_hh_status_text am: 8bd04543a2
Chris Manton [Sat, 27 Mar 2021 04:51:26 +0000 (04:51 +0000)]
Add btif/include/btif_hh::btif_hh_status_text am: 8bd04543a2

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

Change-Id: I347b8686b3808a025b72f3c7e9536e0779431c1f

3 years agoUse proper type tHCI_REASON btm_get_acl_disc_reason_code am: 0ef9e3edd3
Chris Manton [Fri, 26 Mar 2021 17:35:04 +0000 (17:35 +0000)]
Use proper type tHCI_REASON btm_get_acl_disc_reason_code am: 0ef9e3edd3

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

Change-Id: Ie39349b97e05ba4d12d0c291c725f6ee76c53d12

3 years agoRevert "Remove unused API BTM_IsPhy2mSupported"
Łukasz Rymanowski [Fri, 26 Mar 2021 17:28:59 +0000 (17:28 +0000)]
Revert "Remove unused API BTM_IsPhy2mSupported"

Reason for revert: This is needed for LE Audio

This reverts commit 5f3ca2bb910c5f18927a15be017879a8387c78fe.

Change-Id: I60b334ef9d3f376eb1b2c68c2a40f748861a5368

3 years agoRevert "Remove unused API BTM_RequestPeerSCA"
Łukasz Rymanowski [Fri, 26 Mar 2021 17:28:22 +0000 (17:28 +0000)]
Revert "Remove unused API BTM_RequestPeerSCA"

Reason for revert: This is needed for LE Audio

This reverts commit ddc067a95ef95fcdc888bfdefc07f784ecac2f1e.

Change-Id: I390a385ce8b5c2b0e76c7775ba3cae8db707b331

3 years agoRevert "Remove unused API BTM_GetPeerSCA"
Łukasz Rymanowski [Fri, 26 Mar 2021 17:27:33 +0000 (17:27 +0000)]
Revert "Remove unused API BTM_GetPeerSCA"

Reason for revert: This is needed for LE Audio

This reverts commit ab4932be3bad052d5a0f7b05cd59b21a88fe26e6.

Change-Id: I0a562e1bee8d3c4f3f7170e34ea92fe657123b96

3 years agoAdd btif/include/btif_hh::btif_hh_status_text
Chris Manton [Sun, 14 Mar 2021 16:52:19 +0000 (09:52 -0700)]
Add btif/include/btif_hh::btif_hh_status_text

Toward loggable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Iab6a4f33a3e498c33f4870abc5abd59e073d03f2

3 years agoUse proper type tHCI_REASON btm_get_acl_disc_reason_code
Chris Manton [Sat, 13 Mar 2021 03:24:11 +0000 (19:24 -0800)]
Use proper type tHCI_REASON btm_get_acl_disc_reason_code

Toward readable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I7b2adfaa55feb96c620adfa5a6cb997055f1ce10