OSDN Git Service

android-x86/system-bt.git
3 years agoAVRCP: pass bdaddr by value when use SdpCb am: 71c573ae67 am: 3a8fb3bd8d
Chienyuan [Thu, 1 Apr 2021 04:49:29 +0000 (04:49 +0000)]
AVRCP: pass bdaddr by value when use SdpCb am: 71c573ae67 am: 3a8fb3bd8d

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

Change-Id: I41b142764217be9408a979b2a0082baeedd7a8aa

3 years agoAVRCP: pass bdaddr by value when use SdpCb am: 71c573ae67
Chienyuan [Thu, 1 Apr 2021 04:01:12 +0000 (04:01 +0000)]
AVRCP: pass bdaddr by value when use SdpCb am: 71c573ae67

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

Change-Id: I243ee6b18962d6ebedab62a2499ed7f1940cb98b

3 years agoMerge "gd hci: Handle overflow of acl credits" am: adb139eb52 am: 9d36491e64 am:...
Myles Watson [Wed, 31 Mar 2021 21:38:54 +0000 (21:38 +0000)]
Merge "gd hci: Handle overflow of acl credits" am: adb139eb52 am: 9d36491e64 am: f90264ebe6

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

Change-Id: Ia5417a8d44a37844f4c5ea8d7eb34593d7666602

3 years agoMerge "A2DP: don't apply codec preference if service disabled" am: ede3dc1a48 am...
Treehugger Robot [Wed, 31 Mar 2021 21:37:57 +0000 (21:37 +0000)]
Merge "A2DP: don't apply codec preference if service disabled" am: ede3dc1a48 am: 38887bbf9c am: ee13114d88

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

Change-Id: I17700fdb8a0a11608a26fdbf045d69126e0f3d3b

3 years agoMerge "gd hci: Handle overflow of acl credits" am: adb139eb52 am: 9d36491e64
Myles Watson [Wed, 31 Mar 2021 21:12:00 +0000 (21:12 +0000)]
Merge "gd hci: Handle overflow of acl credits" am: adb139eb52 am: 9d36491e64

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

Change-Id: I941e8365529f695e8e6769248b8f4d979cc09f6a

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 "A2DP: don't apply codec preference if service disabled" am: ede3dc1a48 am...
Treehugger Robot [Wed, 31 Mar 2021 20:52:14 +0000 (20:52 +0000)]
Merge "A2DP: don't apply codec preference if service disabled" am: ede3dc1a48 am: 38887bbf9c

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

Change-Id: I57c33153a576f4b3f0558bd05255ba980e90c651

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 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 agoMerge "Use hci_root_inflamed_abort if received root inflamed packet" am: 3c6751a128...
Treehugger Robot [Wed, 31 Mar 2021 03:44:28 +0000 (03:44 +0000)]
Merge "Use hci_root_inflamed_abort if received root inflamed packet" am: 3c6751a128 am: 608f549841 am: fec96b86ca

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

Change-Id: I56ba062e8504d9464947ceab12a1f03b07311498

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

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

Change-Id: I5192d7e87ef4af0be404dbce77644982d55dcd24

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 am:...
Jakub Pawlowski [Tue, 30 Mar 2021 17:06:20 +0000 (17:06 +0000)]
Merge "audio: Introduce client interface support for HAL 2.1" am: 052c371919 am: a2edb67df1 am: aed12aceab

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

Change-Id: I295bf2a8b799c70018b8e7d4aab7da8ad282443e

3 years agoMerge "eatt: Adjust to new L2CAP API behaviour" am: ccd8415985 am: 10e9ba51e8 am...
Jakub Pawlowski [Tue, 30 Mar 2021 17:06:08 +0000 (17:06 +0000)]
Merge "eatt: Adjust to new L2CAP API behaviour" am: ccd8415985 am: 10e9ba51e8 am: 3c42846ff4

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

Change-Id: Iffb796acd4a78826edb695113e101d77a987af89

3 years agoMerge "audio: Introduce client interface support for HAL 2.1" am: 052c371919 am:...
Jakub Pawlowski [Tue, 30 Mar 2021 16:08:29 +0000 (16:08 +0000)]
Merge "audio: Introduce client interface support for HAL 2.1" am: 052c371919 am: a2edb67df1

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

Change-Id: I4aad4510e591c88c546988ffff756c86f4f8c45d

3 years agoMerge "eatt: Adjust to new L2CAP API behaviour" am: ccd8415985 am: 10e9ba51e8
Jakub Pawlowski [Tue, 30 Mar 2021 16:07:22 +0000 (16:07 +0000)]
Merge "eatt: Adjust to new L2CAP API behaviour" am: ccd8415985 am: 10e9ba51e8

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

Change-Id: I533abca3a86007affa0be9c7ad68906eec669025

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 am: 0c0b4...
Sal Savage [Mon, 29 Mar 2021 21:44:33 +0000 (21:44 +0000)]
Merge "Use proper UUID for PBAP-PCE profile descriptor list" am: f859dd1603 am: 0c0b46a040 am: 517e907be3

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

Change-Id: Ic615e8b26504ff395740140cc65068dc92d8528c

3 years agoMerge "Use proper UUID for PBAP-PCE profile descriptor list" am: f859dd1603 am: 0c0b4...
Sal Savage [Mon, 29 Mar 2021 20:43:39 +0000 (20:43 +0000)]
Merge "Use proper UUID for PBAP-PCE profile descriptor list" am: f859dd1603 am: 0c0b46a040

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

Change-Id: I87c2761bf26e79cd770fd83e62d4d9249441624d

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 am: dffc602451 am: f693b0b7e6
Jakub Pawlowski [Mon, 29 Mar 2021 08:44:53 +0000 (08:44 +0000)]
Merge changes I60b334ef,I390a385c,I0a562e1b am: 7ef4e120b3 am: dffc602451 am: f693b0b7e6

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

Change-Id: Ia5232be10bae516c2a6663e083d44efc297d7431

3 years agoMerge changes I60b334ef,I390a385c,I0a562e1b am: 7ef4e120b3 am: dffc602451
Jakub Pawlowski [Mon, 29 Mar 2021 08:02:30 +0000 (08:02 +0000)]
Merge changes I60b334ef,I390a385c,I0a562e1b am: 7ef4e120b3 am: dffc602451

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

Change-Id: I44a1b6f2dd79deb053538baca0913a067485d6b9

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 am: b02c05c777 am: 0b510...
Chris Manton [Sat, 27 Mar 2021 06:13:56 +0000 (06:13 +0000)]
Add btif/include/btif_hh::btif_hh_status_text am: 8bd04543a2 am: b02c05c777 am: 0b51051e71

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

Change-Id: I3f76cf539970cbd7d33bd0bcc13161e839e2c020

3 years agoAdd btif/include/btif_hh::btif_hh_status_text am: 8bd04543a2 am: b02c05c777
Chris Manton [Sat, 27 Mar 2021 05:33:32 +0000 (05:33 +0000)]
Add btif/include/btif_hh::btif_hh_status_text am: 8bd04543a2 am: b02c05c777

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

Change-Id: I6b2f4f1a579540b0a4d443203d6ed2116f0b2b32

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 am: 03f43bf18...
Chris Manton [Fri, 26 Mar 2021 18:42:43 +0000 (18:42 +0000)]
Use proper type tHCI_REASON btm_get_acl_disc_reason_code am: 0ef9e3edd3 am: 03f43bf18b am: eb2aa7303f

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

Change-Id: I3ff49c2d1b9f8225b3b06cdc787c31ceab7dd2a7

3 years agoUse proper type tHCI_REASON btm_get_acl_disc_reason_code am: 0ef9e3edd3 am: 03f43bf18b
Chris Manton [Fri, 26 Mar 2021 18:15:32 +0000 (18:15 +0000)]
Use proper type tHCI_REASON btm_get_acl_disc_reason_code am: 0ef9e3edd3 am: 03f43bf18b

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

Change-Id: I4034b783c9c28faaada686ea69a2f52b8f244022

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 am: 8a314b43b2...
Ivan Lozano [Fri, 26 Mar 2021 14:57:22 +0000 (14:57 +0000)]
Merge "Use whole_static_library for cxx library deps." am: 06191f0dd0 am: 8a314b43b2 am: e97489255b

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

Change-Id: I0917420fa6cf4b2b8fd73eb802c741d9075febc3

3 years agoMerge "Use whole_static_library for cxx library deps." am: 06191f0dd0 am: 8a314b43b2
Ivan Lozano [Fri, 26 Mar 2021 14:18:32 +0000 (14:18 +0000)]
Merge "Use whole_static_library for cxx library deps." am: 06191f0dd0 am: 8a314b43b2

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

Change-Id: Ia84e73e45306d47a8a61a13fd16d4b64861274bd

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 am: ad2007d1ed am: 1cc2e00a3e
Chris Manton [Fri, 26 Mar 2021 07:54:47 +0000 (07:54 +0000)]
Merge "Fix for HID disconnect bug" am: 98d8c6c190 am: ad2007d1ed am: 1cc2e00a3e

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

Change-Id: I69163e70c5352826ef0464fdab6645579248faad

3 years agoMerge changes I6b35e11d,Iacec1d37 am: f1e6b3dc73 am: 83c1697edc am: 1673827c35
Jack He [Fri, 26 Mar 2021 07:54:40 +0000 (07:54 +0000)]
Merge changes I6b35e11d,Iacec1d37 am: f1e6b3dc73 am: 83c1697edc am: 1673827c35

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

Change-Id: If4557a8a32f1d32cd6e5f3877534bb82f9baa9c0

3 years agoMerge "Fix for HID disconnect bug" am: 98d8c6c190 am: ad2007d1ed
Chris Manton [Fri, 26 Mar 2021 07:05:36 +0000 (07:05 +0000)]
Merge "Fix for HID disconnect bug" am: 98d8c6c190 am: ad2007d1ed

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

Change-Id: Iffa0b8e4029e850a781511b582b1d772c8f1551a

3 years agoMerge changes I6b35e11d,Iacec1d37 am: f1e6b3dc73 am: 83c1697edc
Jack He [Fri, 26 Mar 2021 07:04:40 +0000 (07:04 +0000)]
Merge changes I6b35e11d,Iacec1d37 am: f1e6b3dc73 am: 83c1697edc

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

Change-Id: I6cda4448c1b75d754b4457773a4f26c2ab8f4ef0

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 am: 74bdc35a4e am: bfd7f0c8f4
Chris Manton [Fri, 26 Mar 2021 02:10:24 +0000 (02:10 +0000)]
Add tBTA_HH_DEV_DSCP_INFO::ToString am: e1a5fbcb6a am: 74bdc35a4e am: bfd7f0c8f4

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

Change-Id: I308cdf9e4be9046a6d2045c084be540f21b4178b

3 years agoAdd tBTA_HH_DEV_DSCP_INFO::ToString am: e1a5fbcb6a am: 74bdc35a4e
Chris Manton [Fri, 26 Mar 2021 01:17:16 +0000 (01:17 +0000)]
Add tBTA_HH_DEV_DSCP_INFO::ToString am: e1a5fbcb6a am: 74bdc35a4e

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

Change-Id: Ibacf59d1b4152e0ffd220f6c3d128aa95e995daf

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 agoMerge "Re-log btm_sec_l2cap_access_req_by_requirement" am: 6e0b0d1769 am: b885a8f513...
Chris Manton [Fri, 26 Mar 2021 00:24:00 +0000 (00:24 +0000)]
Merge "Re-log btm_sec_l2cap_access_req_by_requirement" am: 6e0b0d1769 am: b885a8f513 am: eadaa51109

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

Change-Id: Id5aee1496b28d0d4e680a4965102699972a2fb79

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 agoMerge "Re-log btm_sec_l2cap_access_req_by_requirement" am: 6e0b0d1769 am: b885a8f513
Chris Manton [Thu, 25 Mar 2021 23:37:34 +0000 (23:37 +0000)]
Merge "Re-log btm_sec_l2cap_access_req_by_requirement" am: 6e0b0d1769 am: b885a8f513

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

Change-Id: I87bbf08436ac69dc5b96c381156596a0502dd887

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 "RootCanal shouldn't depend on common" am: 6913198d02 am: 59534a5bbd am: 92978d8ccd
Treehugger Robot [Thu, 25 Mar 2021 23:03:38 +0000 (23:03 +0000)]
Merge "RootCanal shouldn't depend on common" am: 6913198d02 am: 59534a5bbd am: 92978d8ccd

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

Change-Id: Ia4536f584540e7cb0a05afb58e1dcca5ea450ad3

3 years agogd_acl: Ensure acl is running prior to shutdown am: b3cf7b2f47 am: d94548926d am...
Chris Manton [Thu, 25 Mar 2021 23:02:47 +0000 (23:02 +0000)]
gd_acl: Ensure acl is running prior to shutdown am: b3cf7b2f47 am: d94548926d am: 9240e8667b

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

Change-Id: I8be5f686c1dff4458ccf2ad07b582fbfcad28553

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 am: 59534a5bbd
Treehugger Robot [Thu, 25 Mar 2021 22:14:37 +0000 (22:14 +0000)]
Merge "RootCanal shouldn't depend on common" am: 6913198d02 am: 59534a5bbd

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

Change-Id: I7cf415d6e1a96dcb0709e849d82e615b7f74405b

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

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

Change-Id: Ia4c472de3a021924451b0794504ef8deff60e2ca

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 am: 9cd7983f5d am: 97bd78794f
Jack He [Thu, 25 Mar 2021 19:04:21 +0000 (19:04 +0000)]
GD HCI: Pipe VSEs up in shim layer am: e53576837a am: 9cd7983f5d am: 97bd78794f

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

Change-Id: I9abac807e32c2dded74357316ce768432867b31c

3 years agoGD HCI: Pipe VSEs up in shim layer am: e53576837a am: 9cd7983f5d
Jack He [Thu, 25 Mar 2021 18:23:01 +0000 (18:23 +0000)]
GD HCI: Pipe VSEs up in shim layer am: e53576837a am: 9cd7983f5d

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

Change-Id: I9b3ab28d706d7814e2d407797d042735f55281d8

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 am: 964b2a13...
Jack He [Thu, 25 Mar 2021 15:48:52 +0000 (15:48 +0000)]
GD Metrics: Check if RawAddress is null before converting am: 6ffa090b31 am: 964b2a1367 am: 095403d382

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

Change-Id: Ifdb8723786e37c06b8ffd67e0cdb7301618b45b9

3 years agoGD Metrics: Check if RawAddress is null before converting am: 6ffa090b31 am: 964b2a1367
Jack He [Thu, 25 Mar 2021 15:06:08 +0000 (15:06 +0000)]
GD Metrics: Check if RawAddress is null before converting am: 6ffa090b31 am: 964b2a1367

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

Change-Id: I73a16d12c8b895663e06770ce7f9c9d16d7a0d5b

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 agoMerge "GD HCI: Support vendor specific event in GD" am: c06e2b6b87 am: 3b7e32d7da...
Treehugger Robot [Thu, 25 Mar 2021 07:50:17 +0000 (07:50 +0000)]
Merge "GD HCI: Support vendor specific event in GD" am: c06e2b6b87 am: 3b7e32d7da am: b7535a0bd4

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

Change-Id: Iadde9196f18a9f105f075317e949a8d91fddfc60

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 am: 3b7e32d7da
Treehugger Robot [Thu, 25 Mar 2021 07:06:44 +0000 (07:06 +0000)]
Merge "GD HCI: Support vendor specific event in GD" am: c06e2b6b87 am: 3b7e32d7da

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

Change-Id: Icd64529c4653b151eb99b6648301b3fb8ed02cbd

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 am: dad261a7d4 am...
Treehugger Robot [Wed, 24 Mar 2021 19:56:32 +0000 (19:56 +0000)]
Merge "metrics: don't crash if `address` is NULL" am: 8d9c4170bd am: dad261a7d4 am: cf2d7ab72c

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

Change-Id: Ica1781b3b3fc34cecae77fa4ded58929bab0586d

3 years agoMerge "btaa: Add the method of onActivityLogsReady into btif interface" am: 28669d137...
Mingguang Xu [Wed, 24 Mar 2021 19:56:04 +0000 (19:56 +0000)]
Merge "btaa: Add the method of onActivityLogsReady into btif interface" am: 28669d1376 am: ca8b2f221e am: 6aa8b7098e

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

Change-Id: I992e38c32703c1bf95259ccefa8536ba4e36b7e9

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

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

Change-Id: I0bc18458bc3b917809933327812008870a620468

3 years agoMerge "btaa: Add the method of onActivityLogsReady into btif interface" am: 28669d137...
Mingguang Xu [Wed, 24 Mar 2021 19:33:58 +0000 (19:33 +0000)]
Merge "btaa: Add the method of onActivityLogsReady into btif interface" am: 28669d1376 am: ca8b2f221e

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

Change-Id: I8175e738e642311f4d9661ada527a7bc0a3966c4

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