OSDN Git Service

android-x86/system-bt.git
3 years agoMerge changes from topic "bt-gd-vse" am: 814f49d73c am: 5c196bd3f9 am: 8b905f137c
Myles Watson [Wed, 7 Apr 2021 02:04:53 +0000 (02:04 +0000)]
Merge changes from topic "bt-gd-vse" am: 814f49d73c am: 5c196bd3f9 am: 8b905f137c

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

Change-Id: Ic67a04d08e6c391b8926502fb273e45d68e191e8

3 years agoMerge changes from topic "bt-gd-vse" am: 814f49d73c am: 5c196bd3f9
Myles Watson [Wed, 7 Apr 2021 01:14:24 +0000 (01:14 +0000)]
Merge changes from topic "bt-gd-vse" am: 814f49d73c am: 5c196bd3f9

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

Change-Id: I4d8dae6dda0d34535266b363ee6058b70e06a0a6

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 ago[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write...
Chris Manton [Tue, 6 Apr 2021 22:29:12 +0000 (22:29 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 4deeb022c7 am: d0a72022c3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1be17a03235f777dc648ec7088bb2c42eadd69b7

3 years ago[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write...
Chris Manton [Tue, 6 Apr 2021 22:28:32 +0000 (22:28 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 4deeb022c7 am: ad7f1f6f28 am: f6053c9846 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0b0f1d5a6d80a9694fff83060f15637bd3076c17

3 years ago[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write...
Chris Manton [Tue, 6 Apr 2021 22:28:12 +0000 (22:28 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: bf9310d474 am: a695aca255 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I132a827131c69979b2fd3b3627a65076b9c7f6ab

3 years agoRESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 4deeb022c7
Chris Manton [Tue, 6 Apr 2021 21:33:28 +0000 (21:33 +0000)]
RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 4deeb022c7

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

Change-Id: Ic73065a6d1331e4202cf3aa7863994ec36c2a8c5

3 years agoRESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 4deeb022c7 am...
Chris Manton [Tue, 6 Apr 2021 21:28:49 +0000 (21:28 +0000)]
RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 4deeb022c7 am: ad7f1f6f28

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

Change-Id: I39499431387f3403bcf670cf1204d19d274d084b

3 years agoRESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: bf9310d474
Chris Manton [Tue, 6 Apr 2021 21:28:45 +0000 (21:28 +0000)]
RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: bf9310d474

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

Change-Id: Ia0a32691c2de3431551976d1b46f3c2dd2fda97f

3 years agoRESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 4deeb022c7
Chris Manton [Tue, 6 Apr 2021 21:28:40 +0000 (21:28 +0000)]
RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: 4deeb022c7

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

Change-Id: Id30734b754cef6dc3b487f8750e756ef1bf9c5ff

3 years agoRESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write
Chris Manton [Sun, 21 Mar 2021 22:51:18 +0000 (15:51 -0700)]
RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write

Bug: 181860042
Test: net_test_stack
Tag: #security
Ignore-AOSP-First: Security

Change-Id: I5d8d4051a1439ee9f1f04af3dfe6da6d8016e546

3 years agoRESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write
Chris Manton [Sun, 21 Mar 2021 22:51:18 +0000 (15:51 -0700)]
RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write

Bug: 181860042
Test: net_test_stack
Tag: #security
Ignore-AOSP-First: Security

Change-Id: I5d8d4051a1439ee9f1f04af3dfe6da6d8016e546

3 years agoRESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write
Chris Manton [Sun, 21 Mar 2021 22:51:18 +0000 (15:51 -0700)]
RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write

Bug: 181860042
Test: net_test_stack
Tag: #security
Ignore-AOSP-First: Security

Change-Id: I5d8d4051a1439ee9f1f04af3dfe6da6d8016e546

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 agoMerge "Add AttributionSource param to bluetooth scanning methods." into sc-dev
Oli Lan [Tue, 6 Apr 2021 12:16:33 +0000 (12:16 +0000)]
Merge "Add AttributionSource param to bluetooth scanning methods." into sc-dev

3 years agoMerge "A2DP: Log BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED" am: 07cdb42b56 am: 643531c431...
Josh Wu [Tue, 6 Apr 2021 03:43:00 +0000 (03:43 +0000)]
Merge "A2DP: Log BLUETOOTH_A2DP_PLAYBACK_STATE_CHANGED" am: 07cdb42b56 am: 643531c431 am: 9610041ba8

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

Change-Id: Iedf5a6f1d78ded7ed4fcd100a8c25032b68835ac

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

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

Change-Id: I332dd54dff4b35c8dce33d38fa7a6b80e54efbc5

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 am: bb4cccec50 am: 2ffe755230
Treehugger Robot [Mon, 5 Apr 2021 22:21:24 +0000 (22:21 +0000)]
Merge "Do not close the fd on drop." am: aeb13ee45c am: bb4cccec50 am: 2ffe755230

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

Change-Id: If70053ad29059f7edb5160612c88b82465bb0cda

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

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

Change-Id: Ib6826cb0fc0a5f1e4e1c731fa4d50626a51baac0

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 am...
Treehugger Robot [Fri, 2 Apr 2021 19:30:20 +0000 (19:30 +0000)]
Merge "Correct log stack/rfcomm/rfc_mx_fsm::rfc_mx_sm_execute" am: bd09e1666f am: bed7befdad am: 0345eef3c2

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

Change-Id: I76b7e96f1758565fd792aafb1733917c8e79541b

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

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

Change-Id: I4d2ed68bc40c55ffdde067d9354d0a8fb3f86962

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 agoMerge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739 am...
TreeHugger Robot [Fri, 2 Apr 2021 02:19:05 +0000 (02:19 +0000)]
Merge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739 am: 0e4254ae23 am: 84b70dc87b

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

Change-Id: Icf9c931b21f2529528cc7cb772c8b71e59eb52a0

3 years agoMerge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739 am...
TreeHugger Robot [Fri, 2 Apr 2021 01:37:29 +0000 (01:37 +0000)]
Merge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739 am: 784bbe2a4c

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

Change-Id: I166fa43f7371e0076c60219161372baddb37a3fa

3 years agoMerge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739 am...
TreeHugger Robot [Fri, 2 Apr 2021 01:33:25 +0000 (01:33 +0000)]
Merge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739 am: 0e4254ae23

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

Change-Id: Ibf4089efd5e95072a696a27e9221204af795c5bb

3 years agoMerge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739
TreeHugger Robot [Fri, 2 Apr 2021 00:57:55 +0000 (00:57 +0000)]
Merge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739

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

Change-Id: Ia6330f75600e3acd96a0025026c3568a391c7777

3 years agoMerge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739
TreeHugger Robot [Fri, 2 Apr 2021 00:53:01 +0000 (00:53 +0000)]
Merge "Check packet size in avrc_pars_browse_rsp" into rvc-dev am: 05401e8739

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

Change-Id: Ie0c31c14363a6fee854770372b0a3c5cd4262cfb

3 years agoMerge "Check packet size in avrc_pars_browse_rsp" into rvc-dev
TreeHugger Robot [Fri, 2 Apr 2021 00:22:29 +0000 (00:22 +0000)]
Merge "Check packet size in avrc_pars_browse_rsp" into rvc-dev

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 am: c8b8526453 am:...
Qasim Javed [Thu, 1 Apr 2021 21:59:04 +0000 (21:59 +0000)]
Merge "rusty-gd: Remove CancelableTaskTracker" am: 6a00c5a536 am: c8b8526453 am: f0eae2af19

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

Change-Id: Ic3e93e5474d1c50381171f28e719a0eca557316f

3 years agoMerge "rusty-gd: Remove CancelableTaskTracker" am: 6a00c5a536 am: c8b8526453
Qasim Javed [Thu, 1 Apr 2021 21:13:19 +0000 (21:13 +0000)]
Merge "rusty-gd: Remove CancelableTaskTracker" am: 6a00c5a536 am: c8b8526453

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

Change-Id: I7132c649de863d33451f3233cc1ba57bc6e61fcb

3 years agoMerge "gd hci: Check acl connection when start round robin" am: ff86e8a812 am: 46b563...
Treehugger Robot [Thu, 1 Apr 2021 20:37:31 +0000 (20:37 +0000)]
Merge "gd hci: Check acl connection when start round robin" am: ff86e8a812 am: 46b56303ae am: 40d2ff8ae4

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

Change-Id: I46b43472fd28ee6314bc94200492d0ec9df00a91

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 "gd hci: Check acl connection when start round robin" am: ff86e8a812 am: 46b56303ae
Treehugger Robot [Thu, 1 Apr 2021 20:12:52 +0000 (20:12 +0000)]
Merge "gd hci: Check acl connection when start round robin" am: ff86e8a812 am: 46b56303ae

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

Change-Id: I5932b8ee8956a8ec795a14cea6606db47cb6ab0a

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 agoAdd AttributionSource param to bluetooth scanning methods.
Oli Lan [Thu, 1 Apr 2021 12:16:00 +0000 (13:16 +0100)]
Add AttributionSource param to bluetooth scanning methods.

This adds an AttributionSource parameter to the AdapterService and
GattService methods that perform scanning or discovery.

Bug: 183203469
Test: atest GattServiceTest
Test: atest AdapterServiceTest
Test: atest CtsPermissionTestCases:android.permission.cts.NearbyDevicesPermissionTest
Change-Id: I2e8351786597437c88f128709c81255b87599a7e

3 years agoMerge "[GD Controller] Return version info to legacy stack" am: 83a68cf92c am: 126477...
Treehugger Robot [Thu, 1 Apr 2021 10:33:09 +0000 (10:33 +0000)]
Merge "[GD Controller] Return version info to legacy stack" am: 83a68cf92c am: 1264775cab am: 1f4db1aa0a

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

Change-Id: I66154b58991a08d4c6e4fee288630b699d5cb0ed

3 years agoMerge "BluetoothAudioHAL: Don't fetch the provider without HAL version" am: 233433e76...
Cheney Ni [Thu, 1 Apr 2021 10:32:52 +0000 (10:32 +0000)]
Merge "BluetoothAudioHAL: Don't fetch the provider without HAL version" am: 233433e76e am: fb2650eaf2 am: dd15d9acd2

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

Change-Id: I5046bb9a7cb47af24de2879a8644d7df21fef23c

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

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

Change-Id: Id7f3301d2cb317960d7081f443aee2c5e17409f5

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

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

Change-Id: I0f9d783e78945f836e335a9f55fbc9b811018f78

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 ago[automerger skipped] AVRCP: pass bdaddr by value when use SdpCb am: 71c573ae67 am...
Chienyuan [Thu, 1 Apr 2021 04:50:50 +0000 (04:50 +0000)]
[automerger skipped] AVRCP: pass bdaddr by value when use SdpCb am: 71c573ae67 am: 34fcdf9108 am: 5a3715b53e -s ours

am skip reason: skip tag Change-Id I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1 71c573ae67 is already in history

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

Change-Id: If910abded6f86612afb9939eb97d28941ebcfeeb

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 am: 34fcdf9108
Chienyuan [Thu, 1 Apr 2021 04:16:09 +0000 (04:16 +0000)]
AVRCP: pass bdaddr by value when use SdpCb am: 71c573ae67 am: 34fcdf9108

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

Change-Id: Iadbe19b9f55f0377cf9e39b71309bce1c89ac616

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 agoAVRCP: pass bdaddr by value when use SdpCb am: 71c573ae67
Chienyuan [Thu, 1 Apr 2021 03:56:26 +0000 (03:56 +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: I04398790efa50000a05f0b4309684376d95c1443

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 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 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 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