OSDN Git Service

android-x86/system-bt.git
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 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

3 years agoMerge "Use whole_static_library for cxx library deps." am: 06191f0dd0
Ivan Lozano [Fri, 26 Mar 2021 13:35:43 +0000 (13:35 +0000)]
Merge "Use whole_static_library for cxx library deps." am: 06191f0dd0

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

Change-Id: I46e9d811ca25cefc855e6f7c7daef004c2bbc545

3 years agoMerge "Use whole_static_library for cxx library deps."
Ivan Lozano [Fri, 26 Mar 2021 13:01:14 +0000 (13:01 +0000)]
Merge "Use whole_static_library for cxx library deps."

3 years agoMerge "Fix for HID disconnect bug" am: 98d8c6c190
Chris Manton [Fri, 26 Mar 2021 06:46:12 +0000 (06:46 +0000)]
Merge "Fix for HID disconnect bug" am: 98d8c6c190

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

Change-Id: I93783ac9d210ca5021058d558da8d38127d3db0e

3 years agoMerge "Fix for HID disconnect bug"
Chris Manton [Fri, 26 Mar 2021 06:31:34 +0000 (06:31 +0000)]
Merge "Fix for HID disconnect bug"

3 years agoMerge changes I6b35e11d,Iacec1d37 am: f1e6b3dc73
Jack He [Fri, 26 Mar 2021 06:31:03 +0000 (06:31 +0000)]
Merge changes I6b35e11d,Iacec1d37 am: f1e6b3dc73

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

Change-Id: I81ba01d162c9b9829acba92dfb2a934b8d2a9d7b

3 years agoMerge changes I6b35e11d,Iacec1d37
Jack He [Fri, 26 Mar 2021 05:56:01 +0000 (05:56 +0000)]
Merge changes I6b35e11d,Iacec1d37

* changes:
  HCI: Send Debug packet when HCI timeout
  HCI: Add support for Debug packet

3 years agoAdd tBTA_HH_DEV_DSCP_INFO::ToString am: e1a5fbcb6a
Chris Manton [Fri, 26 Mar 2021 00:36:31 +0000 (00:36 +0000)]
Add tBTA_HH_DEV_DSCP_INFO::ToString am: e1a5fbcb6a

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

Change-Id: I851ef49d319feac4076a3dd8c3ec49bb817d49d6

3 years agoFix for HID disconnect bug
Chris Manton [Mon, 15 Mar 2021 17:46:12 +0000 (10:46 -0700)]
Fix for HID disconnect bug

Callback to btif layer to clear state and inform about
HID host profile disconnecting a peripheral.

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

Change-Id: I17cefb6e0c641ccb4517479e6b358c80e83f1ee7

3 years agoUse proper UUID for PBAP-PCE profile descriptor list
Sal Savage [Thu, 25 Mar 2021 23:16:22 +0000 (16:16 -0700)]
Use proper UUID for PBAP-PCE profile descriptor list

According to the PBAP specification, the PCE SDP record should use the
UUID 0x1130 (PBAP) in the profile descriptor list. We mistakenly use the
PBAP-PCE UUID of 0x112e instead, coming from the JNI. This changes
updates our record to use the correct UUID.

Tag: #stability
Bug: 160443921
Test: sdptool browse and check for the proper UUID 0x1130
Change-Id: I5256da3a5bba1f7ced04aa58e9784409e8ae4fc5

3 years agoMerge "Re-log btm_sec_l2cap_access_req_by_requirement" am: 6e0b0d1769
Chris Manton [Thu, 25 Mar 2021 22:58:05 +0000 (22:58 +0000)]
Merge "Re-log btm_sec_l2cap_access_req_by_requirement" am: 6e0b0d1769

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

Change-Id: I4ef9e92a016cba1fd1145f4660fcc683f0ce86a6

3 years agoHCI: Send Debug packet when HCI timeout
Myles Watson [Thu, 25 Mar 2021 20:10:33 +0000 (13:10 -0700)]
HCI: Send Debug packet when HCI timeout

Bug: 183061492
Test: cert/run
      atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: I6b35e11dd802138469b0024611113eb822b08637

3 years agoHCI: Add support for Debug packet
Myles Watson [Thu, 25 Mar 2021 20:10:12 +0000 (13:10 -0700)]
HCI: Add support for Debug packet

Bug: 183061492
Test: cert/run
      atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Iacec1d37a95514d23f90a26f42808d627d2c6b0f

3 years agoAdd tBTA_HH_DEV_DSCP_INFO::ToString
Chris Manton [Wed, 17 Mar 2021 16:47:24 +0000 (09:47 -0700)]
Add tBTA_HH_DEV_DSCP_INFO::ToString

Toward loggable code

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

Change-Id: Ic3cdd525b544f593634b9b233722a40f6c10b840

3 years agoMerge "Re-log btm_sec_l2cap_access_req_by_requirement"
Chris Manton [Thu, 25 Mar 2021 22:16:10 +0000 (22:16 +0000)]
Merge "Re-log btm_sec_l2cap_access_req_by_requirement"

3 years agoMerge "RootCanal shouldn't depend on common" am: 6913198d02
Treehugger Robot [Thu, 25 Mar 2021 21:39:02 +0000 (21:39 +0000)]
Merge "RootCanal shouldn't depend on common" am: 6913198d02

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

Change-Id: Idfb8ed8ad8144c548ef5de669ac80a4d76b5dcf4

3 years agogd_acl: Ensure acl is running prior to shutdown am: b3cf7b2f47
Chris Manton [Thu, 25 Mar 2021 21:38:17 +0000 (21:38 +0000)]
gd_acl: Ensure acl is running prior to shutdown am: b3cf7b2f47

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

Change-Id: Ieb602ee9bb6c3dc52b73b01049e989005ca7d34a

3 years agoMerge "RootCanal shouldn't depend on common"
Treehugger Robot [Thu, 25 Mar 2021 21:27:52 +0000 (21:27 +0000)]
Merge "RootCanal shouldn't depend on common"

3 years agoRe-log btm_sec_l2cap_access_req_by_requirement
Chris Manton [Thu, 18 Mar 2021 21:16:45 +0000 (14:16 -0700)]
Re-log btm_sec_l2cap_access_req_by_requirement

Toward loggable code

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

Change-Id: I39b877969a38622ec8dffed39ea8c531afab88af

3 years agoUse whole_static_library for cxx library deps.
Ivan Lozano [Thu, 25 Mar 2021 15:56:49 +0000 (11:56 -0400)]
Use whole_static_library for cxx library deps.

static_library has reverted to the old behavior of not being bundled
into rlibs, however whole_static_library has been added to support that
behavior.

Bug: 183182230
Test: mma
Change-Id: If0166b1347b005c03e9e1e1c2805513c0ec245d3

3 years agogd_acl: Ensure acl is running prior to shutdown
Chris Manton [Mon, 22 Mar 2021 22:04:05 +0000 (15:04 -0700)]
gd_acl: Ensure acl is running prior to shutdown

Synchronize stack shutdown

Bug: 176960731
Test: bluetooth_test_gd --gtest_filter=AclManagerLifeCycleTest.*
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I8a2a321f9605e26da8ce340badc87e2f7208209d

3 years agoGD HCI: Pipe VSEs up in shim layer am: e53576837a
Jack He [Thu, 25 Mar 2021 17:44:12 +0000 (17:44 +0000)]
GD HCI: Pipe VSEs up in shim layer am: e53576837a

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

Change-Id: Ida91f1ca6a867d186c6badb3812c7b5120db590c

3 years agoRootCanal shouldn't depend on common
Myles Watson [Wed, 24 Mar 2021 23:04:57 +0000 (16:04 -0700)]
RootCanal shouldn't depend on common

Bug: 180413087
Test: cert/run
      atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: I743af9de1b816a485d4fb8e4c242d7beebd2eb49

3 years agoGD Metrics: Check if RawAddress is null before converting am: 6ffa090b31
Jack He [Thu, 25 Mar 2021 14:45:34 +0000 (14:45 +0000)]
GD Metrics: Check if RawAddress is null before converting am: 6ffa090b31

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

Change-Id: I1092a84129bd0a0dae7ff99fb4614f4ab57181c9

3 years agoGD HCI: Pipe VSEs up in shim layer
Jack He [Thu, 25 Mar 2021 07:29:29 +0000 (00:29 -0700)]
GD HCI: Pipe VSEs up in shim layer

* Register known Android VSEs in shim layer
* Pipeline them through data callbacks so that they will
  be handled by btu_hcif_process_event() after beging posted
  to main thread by post_to_main_message_loop()

Tag: #gd-refactor
Bug: 183057550
Test: make, manual test BQR events
Change-Id: I849f02eec35f739f27d16803cea639c5e1ee1147

3 years agoMerge "GD HCI: Support vendor specific event in GD" am: c06e2b6b87
Treehugger Robot [Thu, 25 Mar 2021 06:27:27 +0000 (06:27 +0000)]
Merge "GD HCI: Support vendor specific event in GD" am: c06e2b6b87

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

Change-Id: I03103934a296aac6148a2bbde4ce6b903cd4877d

3 years agoGD Metrics: Check if RawAddress is null before converting
Jack He [Thu, 25 Mar 2021 06:25:59 +0000 (23:25 -0700)]
GD Metrics: Check if RawAddress is null before converting

Tag: #gd-refactor
Fixes: 183670698
Bug: 183670698
Test: make
Change-Id: Ibc46813a34db08ec899145e9d196d6bf0c96d897

3 years agoMerge "GD HCI: Support vendor specific event in GD"
Treehugger Robot [Thu, 25 Mar 2021 05:51:31 +0000 (05:51 +0000)]
Merge "GD HCI: Support vendor specific event in GD"

3 years agoGD HCI: Support vendor specific event in GD
Jack He [Thu, 25 Mar 2021 00:53:18 +0000 (17:53 -0700)]
GD HCI: Support vendor specific event in GD

* Add a handler for vendor specific command
* Add registration and unregistration APIs
* LOG_ERROR when an unknown vendor specific event is received
* Add unit tests to validate the above functions

Tag: #gd-refactor
Bug: 183057550
Test: bluetooth_test_gd
Change-Id: I00d6d892f3d60a8909352061dcae45f92d47b91d

3 years agoMerge "metrics: don't crash if `address` is NULL" am: 8d9c4170bd
Treehugger Robot [Wed, 24 Mar 2021 18:59:23 +0000 (18:59 +0000)]
Merge "metrics: don't crash if `address` is NULL" am: 8d9c4170bd

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

Change-Id: Ie4871353997995f48dde9ff97fe2348e2a7566b2

3 years agoMerge "btaa: Add the method of onActivityLogsReady into btif interface" am: 28669d1376
Mingguang Xu [Wed, 24 Mar 2021 18:57:35 +0000 (18:57 +0000)]
Merge "btaa: Add the method of onActivityLogsReady into btif interface" am: 28669d1376

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

Change-Id: I1bf7612dfa0ce4e1783e7f23c48a821ed7a176d3

3 years agoMerge "metrics: don't crash if `address` is NULL"
Treehugger Robot [Wed, 24 Mar 2021 18:30:30 +0000 (18:30 +0000)]
Merge "metrics: don't crash if `address` is NULL"

3 years agoMerge "btaa: Add the method of onActivityLogsReady into btif interface"
Mingguang Xu [Wed, 24 Mar 2021 17:53:36 +0000 (17:53 +0000)]
Merge "btaa: Add the method of onActivityLogsReady into btif interface"