OSDN Git Service
Treehugger Robot [Mon, 15 Feb 2021 12:24:18 +0000 (12:24 +0000)]
Merge "iso/tests: Add more cases for Iso Manager" am:
d4f9c38063
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1562992
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica37ac783ad41d5fa22d86660ceda6292d4b9f0f
Treehugger Robot [Mon, 15 Feb 2021 11:51:25 +0000 (11:51 +0000)]
Merge "iso/tests: Add more cases for Iso Manager"
Chris Manton [Sun, 14 Feb 2021 08:55:09 +0000 (08:55 +0000)]
Use proper types btm_sec_dev_rec_cback_event::bt_status_t am:
ec48100fc6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1575228
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6033b1045dc72248bbdc026793eb0c51edb4a099
Chris Manton [Sun, 14 Feb 2021 08:55:06 +0000 (08:55 +0000)]
Re-log stack/btm/btm_sec::btm_sec_connected am:
d82c00eb75
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1575227
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e608e6f672954a292c2865ca93d7ccbc046736f
Chris Manton [Sun, 14 Feb 2021 08:54:31 +0000 (08:54 +0000)]
Add gd acl shim connection shutdown am:
63e4236700
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1575226
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ideef6a5a49e9a751fa4c6fd65770713c6067b0b0
Sonny Sasaka [Fri, 12 Feb 2021 18:48:45 +0000 (18:48 +0000)]
Merge "Remove direct dependency on libcutils" am:
66e64da87a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1576755
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba16b0b6714ad6077ce34fa94d27791649f95b1d
Chris Manton [Thu, 4 Feb 2021 21:20:58 +0000 (13:20 -0800)]
Use proper types btm_sec_dev_rec_cback_event::bt_status_t
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I42b950a9fb804761217a35a1c489100d8132e76b
Chris Manton [Thu, 4 Feb 2021 21:20:41 +0000 (13:20 -0800)]
Re-log stack/btm/btm_sec::btm_sec_connected
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I41ea59a249acd33ec750b1955adc25139ece9528
Chris Manton [Thu, 4 Feb 2021 07:31:47 +0000 (23:31 -0800)]
Add gd acl shim connection shutdown
Bug:
176960731
Tag: #refactor
Test: gd/cert/run
Change-Id: I598e8a3f352a78c989cecf10eae1b00bb755fe2c
Sonny Sasaka [Fri, 12 Feb 2021 18:31:49 +0000 (18:31 +0000)]
Merge "Remove direct dependency on libcutils"
Treehugger Robot [Fri, 12 Feb 2021 06:13:56 +0000 (06:13 +0000)]
Merge "Revert "hci: Remove SimultaneousLeHost bit"" am:
35cdc595b8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1585105
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6a1dca8456a176e6438a6f57d81a7eb5af7a87a7
Treehugger Robot [Fri, 12 Feb 2021 05:35:31 +0000 (05:35 +0000)]
Merge "Revert "hci: Remove SimultaneousLeHost bit""
Myles Watson [Thu, 11 Feb 2021 23:28:01 +0000 (15:28 -0800)]
Revert "hci: Remove SimultaneousLeHost bit"
This reverts commit
09931b889fee0037510e48eb639b091041273122.
The SimultaneousLeHost bit was deprecated in version 4.1 of the
spec, but some Bluetooth chips still need it to be set.
Bug:
179958088
Test: atest bluetooth_test_gd
observe LMP features on a Pixel 3 when using GD controller
Tag: #gd-refactor
Change-Id: Ie8f8a8c9322a6301388ba9415d998e218ef008b1
Jakub Pawlowski [Thu, 11 Feb 2021 19:42:05 +0000 (19:42 +0000)]
Fix bluetooth crash when no bluetooth.audio provider is present am:
48111bd9ff
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1584926
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3fd1e674386aeee30e9e9457e4c32fbe0505d064
Jakub Pawlowski [Thu, 11 Feb 2021 12:32:58 +0000 (13:32 +0100)]
Fix bluetooth crash when no bluetooth.audio provider is present
The stack does fall back to IBluetoothAudioOffload, if present, rather
than crashing.
This is observed on some GSI builds.
Bug:
179967994
Test: start Bluetooth on device without bluetooth.audio HAL
Change-Id: I2979d43a1721f5d41b3a89ec14f670b16ef0d660
Zach Johnson [Wed, 10 Feb 2021 21:55:39 +0000 (21:55 +0000)]
Merge changes Iec2fb8b7,If7eabc0b,I759d041c am:
bf6cb94043
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1582000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie5a0b75b44b5bc4e0b721ba36e8999b2d83bdb84
Zach Johnson [Wed, 10 Feb 2021 21:08:08 +0000 (21:08 +0000)]
Merge changes Iec2fb8b7,If7eabc0b,I759d041c
* changes:
rusty-gd: make sure to notify HCI shim on stack start
rusty-gd: handle padding in sizes
rusty-gd: give special treament to unconstrained only-children
Zach Johnson [Wed, 10 Feb 2021 19:51:38 +0000 (19:51 +0000)]
Merge "rusty-gd: generate bounds checks" am:
7996e75d7a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1582843
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I55213534fea9a4dbe3f085c6ddb44cdef5134159
Zach Johnson [Wed, 10 Feb 2021 19:34:15 +0000 (19:34 +0000)]
Merge "rusty-gd: generate bounds checks"
Zach Johnson [Wed, 10 Feb 2021 18:38:13 +0000 (10:38 -0800)]
rusty-gd: make sure to notify HCI shim on stack start
this way it can register for events, etc
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: Iec2fb8b7dfe67dd843cc546eec217aa688f3c629
Zach Johnson [Wed, 10 Feb 2021 06:51:10 +0000 (22:51 -0800)]
rusty-gd: handle padding in sizes
need to unroll size concatenation, to ensure padding only applies to
size contributions *before* it exists
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: If7eabc0b1f499c2168fec6df6c5e294c5672b8e4
Zach Johnson [Wed, 10 Feb 2021 05:55:35 +0000 (21:55 -0800)]
rusty-gd: give special treament to unconstrained only-children
usually a bad thing with actual human kids :p
if a packet only has one child and that child is running around
unconstrained and causing mischief, assume we may be able to parse
remaining bytes as the child because it's the only possibility
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I759d041c602e1d96eb640a2ec911bef2b80957bb
Zach Johnson [Wed, 10 Feb 2021 04:42:38 +0000 (20:42 -0800)]
rusty-gd: generate bounds checks
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I2d349518e466853a65fbbb296a0ea69e34a4a34d
Hansong Zhang [Wed, 10 Feb 2021 00:14:03 +0000 (00:14 +0000)]
btm_sec: Fix flags am:
492d769e17
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1581071
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6296db1391c903f50514d228bdff3f974fd038b5
Hansong Zhang [Tue, 9 Feb 2021 08:25:03 +0000 (00:25 -0800)]
btm_sec: Fix flags
Don't say link key is authenticated yet during ConfirmReqReply. Wait for
link key notification to see the key type.
Bug:
179724475
Tag: #security
Test: headset
Change-Id: I6d380500f92c2039b469d87f2d79ee40779b10af
Sonny Sasaka [Tue, 9 Feb 2021 22:27:52 +0000 (22:27 +0000)]
Merge "Update source files to build on Linux/Chrome OS" am:
ce6c6b9327
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1576257
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idec3613811471a519f72a8820b6f115786165733
Sonny Sasaka [Tue, 9 Feb 2021 19:54:19 +0000 (19:54 +0000)]
Merge "Update source files to build on Linux/Chrome OS"
Zach Johnson [Tue, 9 Feb 2021 17:12:07 +0000 (17:12 +0000)]
Merge changes I4496bf97,I6368fd2e am:
5a4b5a1249
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1579755
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I49d8e6c50fa0e298833bb6c2bfbea347669c4ac8
Zach Johnson [Tue, 9 Feb 2021 16:26:54 +0000 (16:26 +0000)]
Merge changes I4496bf97,I6368fd2e
* changes:
rusty-gd: some fixes to handle errors & get it somewhat working
rusty-gd: sequence immediate message loop posts
Sonny Sasaka [Tue, 9 Feb 2021 06:09:54 +0000 (22:09 -0800)]
Remove direct dependency on libcutils
libcutils is Android-specific and does not exist in Linux/Chrome OS.
This patch removes direct dependency on it and instead creates an
abstract layer called os_utils which contain separate implementations
for Android (using libcutils) and other OSes.
Bug:
176847216
Tag: #refactor
Test: atest --host bluetooth_test_common
Change-Id: Ifaebbd2baf5d3f7d638d70b3a9b97a1cb7724d10
Sonny Sasaka [Tue, 9 Feb 2021 06:09:48 +0000 (22:09 -0800)]
Update source files to build on Linux/Chrome OS
This modifies some source files to build on Linux:
* Add missing includes
* Add Linux empty stubs for metrics
Bug:
176847216
Tag: #refactor
Test: atest --host bluetooth_test_common
Change-Id: I15c46cd9b748ddd9f7c0712b5a66b259e41cfaa1
Zach Johnson [Tue, 9 Feb 2021 01:30:30 +0000 (01:30 +0000)]
Merge changes I05c6fca1,I25b03d89 am:
a7fc18c5bd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1579289
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3eb86d31623df36c2aa91aabc5cbf50ab23d00be
Zach Johnson [Tue, 9 Feb 2021 00:56:05 +0000 (00:56 +0000)]
Merge changes I05c6fca1,I25b03d89
* changes:
rusty-gd: remaining fixes to get DirectHciTest running consistently
blueberry: print Data as hex, to make matching to wireshark easier
Zach Johnson [Mon, 8 Feb 2021 22:56:53 +0000 (14:56 -0800)]
rusty-gd: some fixes to handle errors & get it somewhat working
still failing to parse an incoming event
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I4496bf97eaa4903d539e80d604b0bd51d1b3dbc5
Jakub Pawlowski [Mon, 8 Feb 2021 21:38:57 +0000 (21:38 +0000)]
Merge "Load bluetooth.audio HAL as either 2.0 or 2.1" am:
6794a3847a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1573166
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I387a81fc240ec1ad96cb2de208e35c958f71d582
Sonny Sasaka [Mon, 8 Feb 2021 21:37:13 +0000 (21:37 +0000)]
Merge "Update GN files for building on Linux/Chrome OS" am:
c113770121
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1573323
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf50cc0c0f22fb7369b0e5604016d7a249487606
Jakub Pawlowski [Mon, 8 Feb 2021 21:23:14 +0000 (21:23 +0000)]
Merge "Load bluetooth.audio HAL as either 2.0 or 2.1"
Sonny Sasaka [Mon, 8 Feb 2021 21:00:32 +0000 (21:00 +0000)]
Merge "Update GN files for building on Linux/Chrome OS"
Jakub Pawlowski [Wed, 3 Feb 2021 21:51:10 +0000 (22:51 +0100)]
Load bluetooth.audio HAL as either 2.0 or 2.1
Test: atest bluetooth-test-audio-hal-interface
Bug:
150670922
Change-Id: I8024901283839c9ee25db732b42f5f9c4a3e5c24
Zach Johnson [Mon, 8 Feb 2021 19:34:16 +0000 (11:34 -0800)]
rusty-gd: sequence immediate message loop posts
this ensures order of operations is preserved
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I6368fd2e07e95b505ac67c3e67343ba2a488b842
Jakub Pawlowski [Mon, 8 Feb 2021 19:19:13 +0000 (19:19 +0000)]
Merge "bt: Make crypto_toolbox_for_test available on the host" am:
345e442e2c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1564639
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idc69e1cddb59f31ce3148ba962da32543c857d08
Jakub Pawlowski [Mon, 8 Feb 2021 18:52:22 +0000 (18:52 +0000)]
Merge "bt: Make crypto_toolbox_for_test available on the host"
Julien Desprez [Mon, 8 Feb 2021 18:34:31 +0000 (18:34 +0000)]
Merge "Fix two bluetooth tests" am:
813e80dd61
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1579930
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I223fa6d3f83551383e103f539b57baa57bf55eb1
Julien Desprez [Mon, 8 Feb 2021 18:18:54 +0000 (18:18 +0000)]
Merge "Fix two bluetooth tests"
Myles Watson [Mon, 8 Feb 2021 17:57:09 +0000 (17:57 +0000)]
AsyncManager: Shorten test time am:
980e3e1414
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1576380
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba18af66f8f411c95da81db95cc70b717b893ba5
Myles Watson [Fri, 5 Feb 2021 05:40:31 +0000 (21:40 -0800)]
AsyncManager: Shorten test time
Fixes:
179441067
Test: atest AsyncManagerSocketTest
Tag: #test-fix
Change-Id: Ib1bd321141ba3da30fc3922a8f7b56c4f40cd3ae
Łukasz Rymanowski [Tue, 19 Jan 2021 13:07:54 +0000 (13:07 +0000)]
bt: Make crypto_toolbox_for_test available on the host
Bug:
150670922
Test: compilation
Tag: #feature
Sponsor: jpawlowski@
Change-Id: I72815f8e9f1721c0a935920bfd055ea5ed9e25ff
Zach Johnson [Mon, 8 Feb 2021 06:17:28 +0000 (22:17 -0800)]
rusty-gd: remaining fixes to get DirectHciTest running consistently
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest
Change-Id: I05c6fca13d9af2705b4ae597f6a458963c0fd53f
Zach Johnson [Sun, 7 Feb 2021 19:22:05 +0000 (11:22 -0800)]
blueberry: print Data as hex, to make matching to wireshark easier
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I25b03d896157451253e2e54bd9c1ee3d23a90286
Julien Desprez [Sun, 7 Feb 2021 21:55:59 +0000 (21:55 +0000)]
Fix two bluetooth tests
Change-Id: I0c0b75e40531169b6455a6daae6b3695a85e0ea1
Test: presubmit
Bug:
179092189
Zach Johnson [Sun, 7 Feb 2021 19:51:51 +0000 (19:51 +0000)]
Merge "rusty-gd: Changes to make the HCI inquiry test pass" am:
734b304010
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1578624
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ce480a805ae322f984ff961bb502451dafda470
Zach Johnson [Sun, 7 Feb 2021 19:32:11 +0000 (19:32 +0000)]
Merge "rusty-gd: Changes to make the HCI inquiry test pass"
Hansong Zhang [Sat, 6 Feb 2021 07:02:03 +0000 (07:02 +0000)]
L2cap shim: Send config callback before register dequeue am:
16ba77a5fe
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1576747
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29d4e6b426768e529541c371e74477bdce82a4b3
Hansong Zhang [Thu, 4 Feb 2021 23:33:12 +0000 (15:33 -0800)]
L2cap shim: Send config callback before register dequeue
We want to let the client (AVCT) know the MTU first. They might need to
send something without MTU available.
On AVCT side, initialize MTU as minimal L2cap MTU for now.
Bug:
179071567
Test: Speaker
Tag: #stability
Change-Id: I654c5fd302096876a3b6d245d173a735468ba949
Qasim Javed [Fri, 5 Feb 2021 05:49:50 +0000 (21:49 -0800)]
rusty-gd: Changes to make the HCI inquiry test pass
These include:
Writing count fields
Correct parsing of vectors
Using the correct offset when parsing struct fields
P.S. Also fixes the tokio panic caused by missing handling of the else
branch in the snoop HAL.
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest:test_inquiry_from_dut
Change-Id: I4bb884369d9d811c906e271c29460a3eb134a727
Treehugger Robot [Fri, 5 Feb 2021 21:47:31 +0000 (21:47 +0000)]
Merge "btsnoop: Fix TRUE is undefined for btsnoop socket" am:
0b512dc073
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1574944
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9805fabc9d234cb7ed69a4909f8f31f201c25f84
Treehugger Robot [Fri, 5 Feb 2021 21:17:53 +0000 (21:17 +0000)]
Merge "btsnoop: Fix TRUE is undefined for btsnoop socket"
Sonny Sasaka [Wed, 3 Feb 2021 19:14:56 +0000 (19:14 +0000)]
Update GN files for building on Linux/Chrome OS
* Add missing GN files
* Move test targets under use.test
* Move non-standard codec targets under use.bt_nonstandard_codecs
* Add missing source files
Bug:
177961465
Tag: #refactor
Test: atest --host bluetooth_test_common
Change-Id: Ib7ba2705b2fd53d4c4d87916e99f35e7fce6c98e
Treehugger Robot [Fri, 5 Feb 2021 17:50:46 +0000 (17:50 +0000)]
Merge "A2DP: AAC encoder uses same value in tick interval and feeding data" am:
121f283252
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1574957
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1b215220b70aa33ea678ef122d96d7adc17d9a55
Treehugger Robot [Fri, 5 Feb 2021 17:01:24 +0000 (17:01 +0000)]
Merge "A2DP: AAC encoder uses same value in tick interval and feeding data"
Cheney Ni [Fri, 5 Feb 2021 13:55:52 +0000 (21:55 +0800)]
A2DP: AAC encoder uses same value in tick interval and feeding data
The tick that AAC encoder wakes up is based on its codec configuration,
but usually is not that fixed 20 ms. The user would hear choppy sound if
using wrong values to calculate the data size, so have to correct.
Fixes:
179268075
Tag: #compatibility
Test: check the bitrate from BTSnoop and no overrun
Change-Id: Iaaddcbd305d4b5383b707b9e0d50e8fe116c043d
Ivan Lozano [Fri, 5 Feb 2021 16:20:55 +0000 (16:20 +0000)]
Merge "rust: Refactor modules for static_lib propagation." am:
e351f0d99e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1575443
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id91e7f608110acbca20d6a9809f3b0e67c07027a
Ivan Lozano [Fri, 5 Feb 2021 15:53:33 +0000 (15:53 +0000)]
Merge "rust: Refactor modules for static_lib propagation."
Zach Johnson [Fri, 5 Feb 2021 00:24:09 +0000 (00:24 +0000)]
add irun (interactive run) am:
20134723a1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1576256
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3930b263f6debbffc6d836d77acd40c37743e3cc
Zach Johnson [Thu, 4 Feb 2021 22:05:52 +0000 (14:05 -0800)]
add irun (interactive run)
fire up your command list of test(s) you want to iterate on
will run to completion, and when there are changes it will rerun
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/irun --rhost
Change-Id: Ic067f70e00740bc5588bdd8b9ac334e834fdb238
Zach Johnson [Thu, 4 Feb 2021 18:23:10 +0000 (18:23 +0000)]
Merge "make incremental blueberry testing faster" am:
e3d12d6efa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1573489
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3abbeb7af66200ec60a04d1e4100f860537579e4
Zach Johnson [Thu, 4 Feb 2021 17:48:11 +0000 (17:48 +0000)]
Merge "make incremental blueberry testing faster"
Ivan Lozano [Thu, 4 Feb 2021 15:06:19 +0000 (10:06 -0500)]
rust: Refactor modules for static_lib propagation.
rust_library modules now bundle their static lib dependencies. As a
result, many of these static_lib listings are no longer necessary.
This CL also includes libcxxbridge05 in libbt_common_sys_prop_cxx and
libbt_shim_ffi in libbluetooth_rust_interop, both static libraries,
to avoid having to add these to dependencies.
Test: mma
Bug:
175886967
Bug:
179122837
Change-Id: I77c53e62d19bcda7a8ace81d7c576eed383b7c87
Cheney Ni [Thu, 4 Feb 2021 10:14:28 +0000 (18:14 +0800)]
btsnoop: Fix TRUE is undefined for btsnoop socket
Because TRUE / FALSE macro is moved to bt_target.h, there is no more
such definition if including only bt_types.h.
Bug:
163134718
Tag: #refactor
Test: check BTSnoop socket is running when only BT_NET_DEBUG=true
Change-Id: I7ac1d5aeaf3eb4f910cf4498fb7096b6cf4c9fe7
Treehugger Robot [Thu, 4 Feb 2021 05:17:08 +0000 (05:17 +0000)]
Merge changes Ibc8a2e94,I04cb8753,Idf047b8d,Id55bb63f am:
4fb81c43e0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1573377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia06a67e9122b52f0d7dd8bc35084490ad716b906
Treehugger Robot [Thu, 4 Feb 2021 03:09:35 +0000 (03:09 +0000)]
Merge changes Ibc8a2e94,I04cb8753,Idf047b8d,Id55bb63f
* changes:
RFCOMM: Use std map to store channel map
AVDT: Use std map to store channel map
Remove unused AVDT API
Fix L2cap shim crash on shutdown
Chris Manton [Thu, 4 Feb 2021 02:11:33 +0000 (02:11 +0000)]
Use proper types tHCI_STATUS/tHCI_REASON am:
ad4657cf5d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1573335
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3b895b2ec8fb888ed4f4da62c60837c1d55df801
Zach Johnson [Thu, 4 Feb 2021 01:15:57 +0000 (17:15 -0800)]
make incremental blueberry testing faster
don't rebuild everything and unzip, instead
only build the specific targets we care about, copy them over directly
skips a lot of build time
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I11e82e178e3901f9af46a510adbced8f1b3333a5
Hansong Zhang [Thu, 4 Feb 2021 01:06:12 +0000 (01:06 +0000)]
Don't fragment when ACL shim is enabled am:
7da41cb8ea
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1573322
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I68360a23247ea41499e57595445c5384b5ca676d
Hansong Zhang [Thu, 4 Feb 2021 00:59:39 +0000 (16:59 -0800)]
RFCOMM: Use std map to store channel map
Instead of using legacy fixed size array
Test: Speaker
Bug:
179117950
Tag: #stability
Change-Id: Ibc8a2e947f218a6d5870cc7a9566306ddc7eb2b3
Treehugger Robot [Thu, 4 Feb 2021 00:54:00 +0000 (00:54 +0000)]
Merge "Controller: Simplify ReadLocalSupportedCommands" am:
2e781edcdf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1563923
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5358f96f7837fde1af4ea2a81828e08d4a1e2edd
Hansong Zhang [Thu, 4 Feb 2021 00:45:45 +0000 (16:45 -0800)]
AVDT: Use std map to store channel map
Instead of using legacy fixed size array
Test: Speaker
Bug:
179117950
Tag: #stability
Change-Id: I04cb875309ed5efc14acb34bbfdc10622eabf3be
Hansong Zhang [Thu, 4 Feb 2021 00:21:15 +0000 (16:21 -0800)]
Remove unused AVDT API
Test: compile
Change-Id: Idf047b8da8f5b19402bbfc304db1e18bd69202c2
Chris Manton [Wed, 3 Feb 2021 23:31:04 +0000 (15:31 -0800)]
Use proper types tHCI_STATUS/tHCI_REASON
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ib8f01833a0de300b7612d584d2eae542f465f54c
Hansong Zhang [Wed, 3 Feb 2021 23:34:15 +0000 (15:34 -0800)]
Fix L2cap shim crash on shutdown
Bug:
179110548
Test: car kit
Tag: #stability
Change-Id: Id55bb63fea32d426f65eecbaf32ed45972059d7e
Hansong Zhang [Wed, 3 Feb 2021 19:50:29 +0000 (11:50 -0800)]
Don't fragment when ACL shim is enabled
Tag: #refactor
Bug:
176963486
Test: PAN
Change-Id: I3c731946e3184e619922a26da9148bfae1fe9ff7
Treehugger Robot [Wed, 3 Feb 2021 21:50:31 +0000 (21:50 +0000)]
Merge "Controller: Simplify ReadLocalSupportedCommands"
Chris Manton [Wed, 3 Feb 2021 18:39:54 +0000 (18:39 +0000)]
btm_loghistory: Add codec reconfig am:
73152da12b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1570800
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85e5d1eb215e8a9124d1a2948c1f2ab1645e4d7a
Chris Manton [Wed, 3 Feb 2021 18:39:51 +0000 (18:39 +0000)]
De-friend various tACL_CB am:
dcea6cc2d4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1568977
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9490fda2950b92b4bebd77f342e843d5045785c1
Chris Manton [Wed, 3 Feb 2021 18:39:06 +0000 (18:39 +0000)]
Streamline BTM_GetNumAclLinks and acl_get_supported_packet_types am:
d3896b63c8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1568976
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I725b6163a7a46b0d78084f37def4cb230da5b1a2
Chris Manton [Tue, 2 Feb 2021 18:16:41 +0000 (10:16 -0800)]
btm_loghistory: Add codec reconfig
Towards loggable code
Bug:
174808695
Tag: #refactor
Test: gd/cert/run
Change-Id: Id18b467d25ab9f7e6cc4a1cd625410eb5d51ac74
Chris Manton [Mon, 1 Feb 2021 19:14:35 +0000 (11:14 -0800)]
De-friend various tACL_CB
Also add default initializers
Towards modular code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I79aa3045e93d157d03c75f7f5f88049b09b04124
Chris Manton [Mon, 1 Feb 2021 19:14:04 +0000 (11:14 -0800)]
Streamline BTM_GetNumAclLinks and acl_get_supported_packet_types
Towards encapsulated code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: Ifb5f6853c823e35c13b997c3e44d480cc53bc89d
Treehugger Robot [Wed, 3 Feb 2021 08:36:40 +0000 (08:36 +0000)]
Merge "HH: Remove redundant assignment" am:
7a2e611cc3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1571442
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iecbab9b9d89a8f213224e32e8f1c9f5176d5d0a4
Chris Manton [Wed, 3 Feb 2021 08:32:32 +0000 (08:32 +0000)]
Remove unused sco initialization am:
fa292fcf65
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1568975
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3ff11abba425d68b50e4c5f1354208b23deb1bad
Chris Manton [Wed, 3 Feb 2021 08:32:29 +0000 (08:32 +0000)]
Remove unused #defs stack/include/bt_types am:
9c7dadab0d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1568974
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id87ecd07b05a1b0632b62698eaa21fa02bddb508
Chris Manton [Wed, 3 Feb 2021 08:32:26 +0000 (08:32 +0000)]
Enum-ify bta/include/bta_api::tBTA_PREF_ROLES am:
739bd658c5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1568973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7361399e9a4b7f935c867ad5258753257272745b
Chris Manton [Wed, 3 Feb 2021 08:32:23 +0000 (08:32 +0000)]
Add bta/include/bta_api::preferred_role_text am:
e567a0f13f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1568972
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa7254a581f1d06998ad91369d9d890ae71396ce
Chris Manton [Wed, 3 Feb 2021 08:32:19 +0000 (08:32 +0000)]
Remove useless #def indirection bta/dm/bta_dm_act am:
ee988d1348
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1568971
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I659c3ba38731558e8315e33534d3dbb3ece32ab6
Chris Manton [Wed, 3 Feb 2021 08:32:16 +0000 (08:32 +0000)]
Move TRACE definitions into trace header file am:
e4c255de00
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1568970
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7b4e9bd1a6f6a69437feac110dabc726cf022d0e
Chris Manton [Wed, 3 Feb 2021 08:32:13 +0000 (08:32 +0000)]
Introduce gd/os/log:CASE_RETURN_TEXT am:
f49eae9f0e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1568969
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b04c7afebe3e23ed522b2c19d34d3a91a831911
Chris Manton [Wed, 3 Feb 2021 08:31:27 +0000 (08:31 +0000)]
Add various LOG_TAG bluetooth am:
53c61dd028
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1568968
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a11ce3ddf89c3eb511be52ff1be7aa268cbb344
Treehugger Robot [Wed, 3 Feb 2021 08:20:42 +0000 (08:20 +0000)]
Merge "HH: Remove redundant assignment"
Treehugger Robot [Wed, 3 Feb 2021 05:31:30 +0000 (05:31 +0000)]
Merge "L2cap scheduler: Drop packets when chennel is closed" am:
6d26c92124
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1571220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d41a3bc275810390bd118c82c1b07228af0a3fa
Chris Manton [Mon, 1 Feb 2021 19:00:36 +0000 (11:00 -0800)]
Remove unused sco initialization
Towards meaningful code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run
Change-Id: I4b264f8e0f63d4fcd2f5f851670395e13b5f5c02