OSDN Git Service

android-x86/system-bt.git
3 years agoMerge "OOB: Implement generateLocalOobData API" into sc-dev
TreeHugger Robot [Wed, 7 Apr 2021 19:32:23 +0000 (19:32 +0000)]
Merge "OOB: Implement generateLocalOobData API" into sc-dev

3 years agoMerge "SCO: Use const reference instead of const value" am: 6d09b3f034 am: fb7d59128a...
Treehugger Robot [Wed, 7 Apr 2021 19:28:44 +0000 (19:28 +0000)]
Merge "SCO: Use const reference instead of const value" am: 6d09b3f034 am: fb7d59128a am: 89b9a637c7

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

Change-Id: I3ece986e545630e77f07ae19793703fad7799c68

3 years agoAdd Volume Control Profile API am: 06f084b01d am: 6e266d5d99 am: 4d5f61f2af
Łukasz Rymanowski [Wed, 7 Apr 2021 19:28:39 +0000 (19:28 +0000)]
Add Volume Control Profile API am: 06f084b01d am: 6e266d5d99 am: 4d5f61f2af

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

Change-Id: Ifdd00f63fefabdceb883d2d7907da6a6c0e12f0d

3 years agovc: Implement Volume Control Profile am: 3578a9e806 am: edcf88700e am: 8fff1fe0ab
Łukasz Rymanowski [Wed, 7 Apr 2021 19:28:33 +0000 (19:28 +0000)]
vc: Implement Volume Control Profile am: 3578a9e806 am: edcf88700e am: 8fff1fe0ab

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

Change-Id: I79552e502d024da77789a349560853931d6d34c0

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

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

Change-Id: I4ac4afbf8da1558c6160040abdffb9ca315e88af

3 years agoAdd Volume Control Profile API am: 06f084b01d am: 6e266d5d99
Łukasz Rymanowski [Wed, 7 Apr 2021 19:04:25 +0000 (19:04 +0000)]
Add Volume Control Profile API am: 06f084b01d am: 6e266d5d99

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

Change-Id: Ieba3bb1600fb6af74cef5dd0c38eb9538d1080fe

3 years agovc: Implement Volume Control Profile am: 3578a9e806 am: edcf88700e
Łukasz Rymanowski [Wed, 7 Apr 2021 19:03:49 +0000 (19:03 +0000)]
vc: Implement Volume Control Profile am: 3578a9e806 am: edcf88700e

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

Change-Id: I78733de2b298fa8ca30809644138bc862f500dfc

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

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

Change-Id: I34f75e72130639a11fe5e5c9f79a0a5102925b54

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

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

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

Change-Id: I3de8beebd36dc467fdc4fd60bd9516abb9aee135

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

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

Change-Id: I04457c3e0dd9e5658da0385b9f53ad460a1c7df0

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

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

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

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

Change-Id: I538c46eeb9cf40400f4f4ec424c4da6ae804213c

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

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

 This profile for expose only connect/disconnect/set volume

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

Change-Id: Ie68c333ffece3958d68580fbfd3a86aec1186711

3 years agolegacy: Plumb gd sco conn req to legacy stack am: c39bd0957d am: 9f001551ad am: 1d919...
Chris Manton [Wed, 7 Apr 2021 09:40:34 +0000 (09:40 +0000)]
legacy: Plumb gd sco conn req to legacy stack am: c39bd0957d am: 9f001551ad am: 1d919a8853

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

Change-Id: I950a483af96867b8997c898bdfab3dc43a401821

3 years agoConst-ify btm_sco_conn_req::DEV_CLASS am: 85fb557c11 am: 5f5e61b775 am: 6342601b5e
Chris Manton [Wed, 7 Apr 2021 09:40:30 +0000 (09:40 +0000)]
Const-ify btm_sco_conn_req::DEV_CLASS am: 85fb557c11 am: 5f5e61b775 am: 6342601b5e

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

Change-Id: I584cebc1f9c1e49d0de848848bf7fd7afc34314f

3 years agolegacy: Plumb gd sco conn req to legacy stack am: c39bd0957d am: 9f001551ad
Chris Manton [Wed, 7 Apr 2021 09:15:10 +0000 (09:15 +0000)]
legacy: Plumb gd sco conn req to legacy stack am: c39bd0957d am: 9f001551ad

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

Change-Id: I00ff1f200a009103b281c5ec4cfa95f720252980

3 years agoConst-ify btm_sco_conn_req::DEV_CLASS am: 85fb557c11 am: 5f5e61b775
Chris Manton [Wed, 7 Apr 2021 09:15:07 +0000 (09:15 +0000)]
Const-ify btm_sco_conn_req::DEV_CLASS am: 85fb557c11 am: 5f5e61b775

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

Change-Id: I91bd44dce72a506026bc399e22d454556243a06c

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 am: b50769045d am...
Treehugger Robot [Wed, 7 Apr 2021 07:34:56 +0000 (07:34 +0000)]
Merge "RFCOMM: Handle failed connection request" am: a2f6bff875 am: b50769045d am: e272248313

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

Change-Id: I6810e0a053fe356663f8050282db14604799324b

3 years agoMerge "RFCOMM: Handle failed connection request" am: a2f6bff875 am: b50769045d
Treehugger Robot [Wed, 7 Apr 2021 07:08:43 +0000 (07:08 +0000)]
Merge "RFCOMM: Handle failed connection request" am: a2f6bff875 am: b50769045d

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

Change-Id: Ie074dcc86ae96f334ff674dbf1a321ad3efa520d

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 am: 05ebf4202c am: 5e5a2b65e5
Chris Manton [Wed, 7 Apr 2021 04:01:41 +0000 (04:01 +0000)]
shim: Plumb e/sco through shim into legacy am: ace8f38d4a am: 05ebf4202c am: 5e5a2b65e5

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

Change-Id: I36b59642c8a033584e881a9d34ac99c35616278a

3 years agoshim: Plumb e/sco connect request am: 7c4c80e3b6 am: 7b98ee7e53 am: 9abc58de22
Chris Manton [Wed, 7 Apr 2021 04:01:37 +0000 (04:01 +0000)]
shim: Plumb e/sco connect request am: 7c4c80e3b6 am: 7b98ee7e53 am: 9abc58de22

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

Change-Id: I415cbab8c0cb6b92e830ab9d41cc3cca0591af6c

3 years agoshim: Plumb e/sco through shim into legacy am: ace8f38d4a am: 05ebf4202c
Chris Manton [Wed, 7 Apr 2021 03:28:35 +0000 (03:28 +0000)]
shim: Plumb e/sco through shim into legacy am: ace8f38d4a am: 05ebf4202c

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

Change-Id: I1db07a592ecbd5a6cb7a1c6ac29dbe5bdf20b011

3 years agoshim: Plumb e/sco connect request am: 7c4c80e3b6 am: 7b98ee7e53
Chris Manton [Wed, 7 Apr 2021 03:28:33 +0000 (03:28 +0000)]
shim: Plumb e/sco connect request am: 7c4c80e3b6 am: 7b98ee7e53

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

Change-Id: I2de916e00b3f9610ef1bf6b03593ab979a53307a

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 am...
Chris Manton [Wed, 7 Apr 2021 02:04:59 +0000 (02:04 +0000)]
Merge "gd: Plumb remote esco/sco connection requests through GD" am: 05f72ffbff am: 7f2a645087 am: bbbfc01d5e

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

Change-Id: I78ca1bfa4ef8277e7d6855591a6d5e02b08ace4d

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 "gd: Plumb remote esco/sco connection requests through GD" am: 05f72ffbff am...
Chris Manton [Wed, 7 Apr 2021 01:14:30 +0000 (01:14 +0000)]
Merge "gd: Plumb remote esco/sco connection requests through GD" am: 05f72ffbff am: 7f2a645087

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

Change-Id: Iea61fbd4fd884b5aaec9bf7158f598fb9979bdc7

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 "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 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 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 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 agoOOB: Implement generateLocalOobData API
Martin Brabham [Wed, 31 Mar 2021 16:41:34 +0000 (09:41 -0700)]
OOB: Implement generateLocalOobData API

Ignore-AOSP-First: Conflict with internal
Bug: 178007935
Tag: #feature
Test: manual
Change-Id: I149907ef7ee3b6f9600ac57950afbc9616381dc0

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