OSDN Git Service
Treehugger Robot [Tue, 20 Oct 2020 20:07:38 +0000 (20:07 +0000)]
Merge "GD Security: InternalEnforceSecurityPolicy" am:
93db05d15b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449382
Change-Id: I95f607f8b6f32a3941cf929313086306c6f1d0fb
Treehugger Robot [Tue, 20 Oct 2020 19:40:45 +0000 (19:40 +0000)]
Merge "GD Security: InternalEnforceSecurityPolicy"
Chris Manton [Tue, 20 Oct 2020 19:33:23 +0000 (19:33 +0000)]
gd: Plumb through ReadRemoteExtendedFeatures am:
22672b306d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466036
Change-Id: Ic0b00846b0488e8651907f437390b643c9d69c81
Martin Brabham [Tue, 20 Oct 2020 19:30:48 +0000 (19:30 +0000)]
Inclusive Language Updates am:
4d4a18a003
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1459349
Change-Id: Ie16652cd82fccc532c3487061b596bd979e69146
Łukasz Rymanowski [Tue, 20 Oct 2020 19:19:09 +0000 (19:19 +0000)]
stack/eatt: Add initial implementation for EATT am:
b6317be537
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1348752
Change-Id: Ib18ebd874157952cd3922ff84ecf0ab9b94863f5
Treehugger Robot [Tue, 20 Oct 2020 19:17:54 +0000 (19:17 +0000)]
Merge "Refactor advertising callback mechanism for GD" am:
33bc8c8990
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438712
Change-Id: Idda155d5f002bd0160e5c3c388fccdadc5cd43d3
Treehugger Robot [Tue, 20 Oct 2020 19:16:19 +0000 (19:16 +0000)]
Merge "Revert "gd: Plumb through ReadRemoteExtendedFeatures"" am:
de7f2688fa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466037
Change-Id: I54fa428e98351bfe255a4e6a3d42860914d255bb
Hansong Zhang [Tue, 20 Oct 2020 19:16:11 +0000 (19:16 +0000)]
L2cap link: Fix a potential nullptr exception am:
a95e67e725
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466517
Change-Id: I95d919cbb816012cc012ad7a538aa5654852d0f4
Chris Manton [Tue, 20 Oct 2020 19:14:18 +0000 (19:14 +0000)]
gd: Plumb through ReadRemoteExtendedFeatures am:
2956f27907
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466516
Change-Id: I6f7242f63a90010d6cd45cd46e041fc8c9c58681
Treehugger Robot [Tue, 20 Oct 2020 19:03:42 +0000 (19:03 +0000)]
[automerger skipped] Merge "Merge redfin/bramble support." am:
b5d9bd0014 -s ours
am skip reason: Change-Id I32df229c5561a1cae7be722865c378145de5a23a with SHA-1
92bd0c9e5c is in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1466508
Change-Id: I18ecfcb2e2461e6e2057fec68d2e18382d216a83
Chris Manton [Mon, 19 Oct 2020 21:37:50 +0000 (14:37 -0700)]
gd: Plumb through ReadRemoteExtendedFeatures
Also plumb through ReadRemoteVersionInformation
Bug:
166280067
Tag: #refactor
Test: atest --host bluetooth_test_gd
Change-Id: Ida0265aec9f7a7e532097bbe0c550c36ba2e071e
Martin Brabham [Tue, 13 Oct 2020 23:42:07 +0000 (16:42 -0700)]
Inclusive Language Updates
slave -> peripheral
SLAVE -> PERIPHERAL
Slave -> Peripheral
BYPASS_INCLUSIVE_LANGUAGE_REASON=required_to_explain_the_update
Bug:
170342881
Tag: #refactor
Test: cert/run --host
Test: atest --host bluetooth_test_common
Test: atest --host bluetooth_test_gd
Test: atest net_test_btif
Change-Id: I4a3cccc0c1d182f172a21a6c70d569e5a89a5916
Merged-In: I4a3cccc0c1d182f172a21a6c70d569e5a89a5916
Łukasz Rymanowski [Fri, 8 May 2020 23:26:11 +0000 (01:26 +0200)]
stack/eatt: Add initial implementation for EATT
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: atest --host net_test_eatt
Change-Id: I934153625e69b1e20af657ded8f17238484cb65e
Treehugger Robot [Tue, 20 Oct 2020 12:12:41 +0000 (12:12 +0000)]
Merge "Refactor advertising callback mechanism for GD"
Treehugger Robot [Tue, 20 Oct 2020 05:58:48 +0000 (05:58 +0000)]
Merge "Revert "gd: Plumb through ReadRemoteExtendedFeatures""
Hansong Zhang [Mon, 19 Oct 2020 22:26:50 +0000 (15:26 -0700)]
L2cap link: Fix a potential nullptr exception
Bug:
141555841
Test: cert/run --host
Tag: #gd-refactor
Change-Id: I1550b750438364fa54d961d529e642c2beddb963
Chris Manton [Tue, 20 Oct 2020 02:51:42 +0000 (02:51 +0000)]
Revert "gd: Plumb through ReadRemoteExtendedFeatures"
This reverts commit
2956f2790709a159f7806b1b514aef2fe539a3e9.
Reason for revert: Broken Build
Change-Id: Ife01bd468d885bac8d270f280d3e5eb2ee0f29e1
Chris Manton [Mon, 19 Oct 2020 21:37:50 +0000 (14:37 -0700)]
gd: Plumb through ReadRemoteExtendedFeatures
Also plumb through ReadRemoteVersionInformation
Bug:
166280067
Tag: #refactor
Test: atest --host bluetooth_test_gd
Change-Id: If08f26cd1cbb6724689cc6b09268cf959285bb58
Martin Brabham [Mon, 5 Oct 2020 19:29:07 +0000 (12:29 -0700)]
GD Security: InternalEnforceSecurityPolicy
Currently, the logic is a little confusing, this CL should simplify it.
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest:test_dut_initiated_no_input_no_output_no_input_no_output_twice_bond_and_enforce
Test: atest --host bluetooth_test_gd
Change-Id: I19753a29487c4bf2c3b40189c0576526d39657c8
Treehugger Robot [Mon, 19 Oct 2020 23:20:09 +0000 (23:20 +0000)]
Merge "Merge redfin/bramble support."
Chris Manton [Mon, 19 Oct 2020 20:34:09 +0000 (20:34 +0000)]
gd: Second entry acl shim am:
da53a01b22
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460810
Change-Id: I1a5af242ddb79fd70b904c9188a5329210172ee4
Chris Manton [Mon, 19 Oct 2020 17:55:47 +0000 (17:55 +0000)]
Add main/shim/helpers::MakeLegacyBtHdrPacket am:
5b78e900e6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460808
Change-Id: I155880a6a848ee91d53e5b4310b497834d97cda4
Chris Manton [Mon, 19 Oct 2020 17:55:45 +0000 (17:55 +0000)]
Use tHCI_STATUS throughout shim interface am:
9fa03e8e5f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460807
Change-Id: Ie62e6a758fa7c5828039dc698c451c0f5f63766d
Xin Li [Mon, 19 Oct 2020 17:08:28 +0000 (10:08 -0700)]
Merge redfin/bramble support.
Bug:
171218636
Merged-In: I32df229c5561a1cae7be722865c378145de5a23a
Change-Id: Ie7ae2703a3ef41871147d42653809a5274a5c499
Chris Manton [Wed, 14 Oct 2020 15:40:38 +0000 (08:40 -0700)]
gd: Second entry acl shim
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: If2df6e773e6625f927426fc0bfa32ff33172cea7
Chris Manton [Wed, 14 Oct 2020 15:43:51 +0000 (08:43 -0700)]
Add main/shim/helpers::MakeLegacyBtHdrPacket
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Idc3083dbd8639b416880dbb8b07667a9356e82ed
Chris Manton [Wed, 14 Oct 2020 15:32:33 +0000 (08:32 -0700)]
Use tHCI_STATUS throughout shim interface
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ia6b600dbe0a8dbf99b1e97d6776a5dfe7f48248f
Łukasz Rymanowski [Mon, 19 Oct 2020 15:28:04 +0000 (15:28 +0000)]
l2c: Add missing event string am:
bc44ab6afd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458305
Change-Id: I32df229c5561a1cae7be722865c378145de5a23a
Łukasz Rymanowski [Mon, 19 Oct 2020 15:27:27 +0000 (15:27 +0000)]
l2c: Fix CoC default response am:
73cd2329c9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458304
Change-Id: I59b44bac4cab9ea770cf81799937967770f3e723
Łukasz Rymanowski [Mon, 19 Oct 2020 15:26:46 +0000 (15:26 +0000)]
l2c: Change std::vector to uint16[] in the tL2C_LCB am:
dc4a812fd6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458303
Change-Id: I4d6486a96dbe0d26478ef3f6d4ed2dc5c37fc27b
Łukasz Rymanowski [Tue, 13 Oct 2020 14:38:04 +0000 (14:38 +0000)]
l2c: Add missing event string
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: compile & manual
Change-Id: Icd9658ca7402a1a43ca0743ded6929833cd8957d
Łukasz Rymanowski [Tue, 13 Oct 2020 14:29:13 +0000 (14:29 +0000)]
l2c: Fix CoC default response
Looks like patch:
203c71a9020 Restore LE CoC l2cap conn rsp
was merged in similar time that:
4456dc7c91e stack/l2c: Add support for credit based connection oriented channels
However those two have a conflict.
This patch fixes that.
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: compile & manual
Change-Id: Ie252d15bdad9d20d9006908aa34e8b566583e4be
Łukasz Rymanowski [Tue, 13 Oct 2020 09:34:56 +0000 (09:34 +0000)]
l2c: Change std::vector to uint16[] in the tL2C_LCB
Since there are places where memset is done on tL2C_LCB
we can't keep std::vector in this struct
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: compile & manual
Change-Id: I2a9795e3c7dbe280b17725eac6333744440e89df
Treehugger Robot [Mon, 19 Oct 2020 09:29:19 +0000 (09:29 +0000)]
Merge "GD-Controller: Do not register NumberOfCompletedPacket without ACL layer" am:
456105020f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1464710
Change-Id: Iafb4d9fd99ba850d9d0bbcf58f45c9a697f845e5
Treehugger Robot [Mon, 19 Oct 2020 09:12:39 +0000 (09:12 +0000)]
Merge "GD-Controller: Do not register NumberOfCompletedPacket without ACL layer"
Chienyuan [Fri, 25 Sep 2020 10:02:31 +0000 (18:02 +0800)]
Refactor advertising callback mechanism for GD
Tag: #refactor
Bug:
169390539
Test: all sl4a tests for BLE advertising
Change-Id: If16058fa2ca07d27bf3a340b0aaff51e0f7ec232
Chris Manton [Sun, 18 Oct 2020 09:15:29 +0000 (09:15 +0000)]
enum-ify stack/include/btm_api_types::BTM_SEC_ am:
600515c780
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1459356
Change-Id: I5134b107c090df8d675b431444756b845dec9811
Chris Manton [Sun, 4 Oct 2020 23:11:58 +0000 (16:11 -0700)]
enum-ify stack/include/btm_api_types::BTM_SEC_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6b7d23ffdd22b4d9e98f214f2fee650ea35d765d
Chris Manton [Sat, 17 Oct 2020 23:58:27 +0000 (23:58 +0000)]
Add main/shim/helpers::debug::DumpBtHdr am:
81e50d6cf0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460809
Change-Id: I2e59386a1048a6467e202aa510e2527cf04cfe0a
Chris Manton [Wed, 14 Oct 2020 15:44:19 +0000 (08:44 -0700)]
Add main/shim/helpers::debug::DumpBtHdr
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I8593550041440c23f1b8eddef4e51a962e317768
Chris Manton [Sat, 17 Oct 2020 03:02:40 +0000 (03:02 +0000)]
Add main/shim/acl_legacy_interface::on_packets_completed am:
4ebd9b7464
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460806
Change-Id: I8dd5a38a744cc6b97d986e52b2aa71bf486556cb
Chris Manton [Sat, 17 Oct 2020 00:10:10 +0000 (00:10 +0000)]
enum-ify stack/btm/security_device_record::BTM_SEC_STATE_ am:
3f86f5a247
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1459357
Change-Id: I82f5b25669008d0ab3695fd4f10be6107eecdfe2
Jack He [Fri, 16 Oct 2020 22:22:22 +0000 (15:22 -0700)]
GD-Controller: Do not register NumberOfCompletedPacket without ACL layer
* Only register it when ACL layer is enabled
* Also hci layer event is only registered by HCI lyaer when HCI layer
is enabled
Test: make, pair and connect Bluetooth devices
Bug:
170603745
Tag: #gd-refactor
Change-Id: Icc94d239c28ba58ceffebee1061b4f8042afecc5
Chris Manton [Wed, 14 Oct 2020 14:57:40 +0000 (07:57 -0700)]
Add main/shim/acl_legacy_interface::on_packets_completed
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ib26e66fbc3ec1e441bb6ffbf368f77e6fa60699f
Chris Manton [Mon, 5 Oct 2020 00:11:13 +0000 (17:11 -0700)]
enum-ify stack/btm/security_device_record::BTM_SEC_STATE_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I2b44dfca2d36c815d65c786ca7371cc24788bcca
Chris Manton [Fri, 16 Oct 2020 18:40:26 +0000 (18:40 +0000)]
Take EventCode::DISCONNECTION_COMPLETE if acl shim is enabled am:
255faddb20
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460805
Change-Id: Ic1dc1372d9e381258f3e02505b3973f7109ec054
Chris Manton [Fri, 16 Oct 2020 18:40:22 +0000 (18:40 +0000)]
Use proper undefined hci error status code am:
2f5249a191
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460804
Change-Id: Iec65a03c54460bca886cf320a790f88356453daa
Chris Manton [Fri, 16 Oct 2020 18:40:18 +0000 (18:40 +0000)]
Include hci_error_code in acl_hci/ble_acl interfaces am:
7768eb542a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460803
Change-Id: I9cc14761f4ebe0bdf500cf1e1e621436b43dd35c
Chris Manton [Fri, 16 Oct 2020 18:40:13 +0000 (18:40 +0000)]
enum-ify stack/include/::hci_error_code am:
69d5cb2ceb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460802
Change-Id: Ie9e2daca132ddaee8fb074e4f5f97d92b768ca7a
Chris Manton [Fri, 16 Oct 2020 18:39:33 +0000 (18:39 +0000)]
Streamline stack/btm/btm_ble_gap::BTM_BleSetScanParams am:
335c1a91fb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1459360
Change-Id: Ie5eb78bc88b0823037a8213acdfee49a0a74d987
Chris Manton [Wed, 14 Oct 2020 06:29:35 +0000 (23:29 -0700)]
Take EventCode::DISCONNECTION_COMPLETE if acl shim is enabled
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Iada55f394e79c197bbb3534c8376a32a040989e5
Chris Manton [Wed, 14 Oct 2020 16:13:00 +0000 (09:13 -0700)]
Use proper undefined hci error status code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I2a95b74e8a8a3b31ec63e2ef64070ab4c2d374f1
Chris Manton [Wed, 14 Oct 2020 16:44:27 +0000 (09:44 -0700)]
Include hci_error_code in acl_hci/ble_acl interfaces
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ic06d5fbfcbba0a5bb1cb4f7f64354942959af46c
Chris Manton [Wed, 14 Oct 2020 06:27:27 +0000 (23:27 -0700)]
enum-ify stack/include/::hci_error_code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ibb48638187a777e307321ea1c309387f0290c4c6
Chris Manton [Mon, 5 Oct 2020 15:16:45 +0000 (08:16 -0700)]
Streamline stack/btm/btm_ble_gap::BTM_BleSetScanParams
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I24971c11203a47a4f06c12b39af2191860666e74
Treehugger Robot [Fri, 16 Oct 2020 14:06:36 +0000 (14:06 +0000)]
Merge "bt: don't conditionally dereference an undefined pointer" am:
193634b010
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458581
Change-Id: Iccca813bc2d6a937009b4bc3db727dea29b92777
Treehugger Robot [Fri, 16 Oct 2020 13:39:56 +0000 (13:39 +0000)]
Merge "bt: don't conditionally dereference an undefined pointer"
Chris Manton [Fri, 16 Oct 2020 11:12:34 +0000 (11:12 +0000)]
Streamline stack/l2cap/l2c_ble::L2CA_GetBleConnRole am:
e15614b575
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1460811
Change-Id: Ic166f4f4a8291ba3186a3afe9b98aaa1373755b9
Chris Manton [Fri, 16 Oct 2020 11:12:30 +0000 (11:12 +0000)]
Internally link stack/hid/hidh_conn:: am:
cae38eece8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1459359
Change-Id: I1817a20550e0926e90380a1b7b1fb61867b9e9d2
Chris Manton [Fri, 16 Oct 2020 11:11:45 +0000 (11:11 +0000)]
Remove unused code am:
3de29288a4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1459358
Change-Id: I8ea2ea02b5181ff67a8cc6a42ff9e924249307f0
Chris Manton [Mon, 12 Oct 2020 15:31:58 +0000 (08:31 -0700)]
Streamline stack/l2cap/l2c_ble::L2CA_GetBleConnRole
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Iad905f404a8cfead76b74ec3ed10f9d50b0ec8df
Chris Manton [Mon, 5 Oct 2020 05:44:10 +0000 (22:44 -0700)]
Internally link stack/hid/hidh_conn::
hidh_try_repage
hidh_process_repage_timer_timeout
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ia6e0e29fc7a466d5441b991ce38211f5378dfcb9
Chris Manton [Mon, 5 Oct 2020 00:11:24 +0000 (17:11 -0700)]
Remove unused code
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I646bd2f5ee59cd0ba3cf321a04c143605251b438
Treehugger Robot [Fri, 16 Oct 2020 05:44:36 +0000 (05:44 +0000)]
Merge changes I3120d8a3,I784dfcb7 am:
211bc5edcc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1463044
Change-Id: I352ab13165e59a9c1293ad10eb2b5013a38ea46d
Treehugger Robot [Fri, 16 Oct 2020 04:48:01 +0000 (04:48 +0000)]
Merge changes I3120d8a3,I784dfcb7
* changes:
Cuttlefish: Call SCO callback for SCO packet
Cuttlefish: Log an error and close on !isOk()
Myles Watson [Thu, 15 Oct 2020 23:16:43 +0000 (16:16 -0700)]
Cuttlefish: Call SCO callback for SCO packet
Bug:
171000929
Test: compiles
Change-Id: I3120d8a35e9c278ad63acce1653dd8737da0ad27
Myles Watson [Thu, 15 Oct 2020 23:16:21 +0000 (16:16 -0700)]
Cuttlefish: Log an error and close on !isOk()
Bug:
170189916
Test: device health tests
Change-Id: I784dfcb7fe9f92158406531582029770bc55679e
Treehugger Robot [Thu, 15 Oct 2020 20:19:12 +0000 (20:19 +0000)]
Merge "Logging: Improve logging in legacy L2CAP to help debugging" am:
37bdd43c2b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1461447
Change-Id: I1d160b97cb623907407b43cdd1d18dde22b6aa00
Treehugger Robot [Thu, 15 Oct 2020 19:54:41 +0000 (19:54 +0000)]
Merge "Logging: Improve logging in legacy L2CAP to help debugging"
Treehugger Robot [Thu, 15 Oct 2020 19:28:56 +0000 (19:28 +0000)]
Merge changes Id0a22412,I4a18d89e,I8b70fb37,I3d030824 am:
c89dbbe295
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1459355
Change-Id: I9b6b04e3a0170adca2bdf52c72e36a239ab1a7fc
Chen Chen [Thu, 15 Oct 2020 19:27:45 +0000 (19:27 +0000)]
[automerger skipped] Merge "Updated SIG wording: whitelist to acceptlist" am:
f2e87f0bf8 -s ours
am skip reason: Change-Id I6707def7cca06068fbbf25f1f403bb5fd31eb215 with SHA-1
c492b27d34 is in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1455051
Change-Id: I7514b11ac2a346b0a446ac17099254521911a2a9
Treehugger Robot [Thu, 15 Oct 2020 19:07:22 +0000 (19:07 +0000)]
Merge changes Id0a22412,I4a18d89e,I8b70fb37,I3d030824
* changes:
enum-ify stack/include/btm_api_types::BTM_SEC_MODE_
Re-log stack/l2cap/l2c_api::L2CA_SendFixedChnlData
Re-log stack/gatt/gatt_cl::gatt_act_discovery
Re-log stack/gatt/att_protocol::attp_send_msg_to_l2cap
Chen Chen [Thu, 15 Oct 2020 19:03:12 +0000 (19:03 +0000)]
Merge "Updated SIG wording: whitelist to acceptlist"
Treehugger Robot [Thu, 15 Oct 2020 18:32:41 +0000 (18:32 +0000)]
Merge "Propagate the bluetooth activity attribution hci log flag to the native layer." am:
b4a8d79348
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1461222
Change-Id: I68dce9e519a2a7700d8e949dd145739fe5cdac2d
Treehugger Robot [Thu, 15 Oct 2020 18:08:01 +0000 (18:08 +0000)]
Merge "Propagate the bluetooth activity attribution hci log flag to the native layer."
TreeHugger Robot [Thu, 15 Oct 2020 17:59:17 +0000 (17:59 +0000)]
Merge "Updated SIG wording: whitelist to acceptlist" into stage-aosp-master
Chris Manton [Thu, 15 Oct 2020 09:17:03 +0000 (09:17 +0000)]
Re-log stack/gatt/gatt_api::GATTC_Discover am:
05ededb03d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1459351
Change-Id: I2ba824b61a7f7f574691fdae052c833f2b3ae17f
Rahul Sabnis [Wed, 14 Oct 2020 18:29:19 +0000 (11:29 -0700)]
Propagate the bluetooth activity attribution hci log flag to the native
layer.
Tag: #feature
Bug:
170769651
Test: atest bluetooth_test_gd:InitFlagsTest
Change-Id: I5c7384ee028d8a688dd391558541714d9121064e
Chris Manton [Sun, 4 Oct 2020 23:06:46 +0000 (16:06 -0700)]
enum-ify stack/include/btm_api_types::BTM_SEC_MODE_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Id0a224123165082c4a4c6d9dcaa9c6d4dc9bdfbe
Chris Manton [Mon, 28 Sep 2020 20:46:14 +0000 (13:46 -0700)]
Re-log stack/l2cap/l2c_api::L2CA_SendFixedChnlData
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I4a18d89e6c2035df8134462ac40e6401f3274790
Chris Manton [Mon, 28 Sep 2020 20:46:01 +0000 (13:46 -0700)]
Re-log stack/gatt/gatt_cl::gatt_act_discovery
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I8b70fb3717a6f89b4d667158f3f3f8cc35a5ef16
Chris Manton [Mon, 28 Sep 2020 20:45:48 +0000 (13:45 -0700)]
Re-log stack/gatt/att_protocol::attp_send_msg_to_l2cap
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I3d030824629bb43cfc7f2b6d8e1c4367f591017e
Chris Manton [Mon, 28 Sep 2020 16:00:54 +0000 (09:00 -0700)]
Re-log stack/gatt/gatt_api::GATTC_Discover
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ib28229c431785d31888cfd8163329f0959fd066b
Treehugger Robot [Thu, 15 Oct 2020 01:13:46 +0000 (01:13 +0000)]
Merge "Inclusive Language Updates" am:
d13ed2899d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1456151
Change-Id: I3975580124676da55472a2a285cbf782fc62be3e
Treehugger Robot [Thu, 15 Oct 2020 00:48:20 +0000 (00:48 +0000)]
Merge "Inclusive Language Updates"
Jack He [Thu, 15 Oct 2020 00:16:04 +0000 (17:16 -0700)]
Logging: Improve logging in legacy L2CAP to help debugging
Bug:
170603745
Test: build
Tag: #gd-refactor
Change-Id: Icca1f5bd2ba15601799dc14d2dbb444f76b60f5f
Chen Chen [Mon, 12 Oct 2020 20:03:48 +0000 (13:03 -0700)]
Updated SIG wording: whitelist to acceptlist
Bug:
170342881
Tag: #refactor
Test: atest --host bluetooth_test_common
Test: atest --host bluetooth_test_gd
Test: atest net_test_btif
BYPASS_INCLUSIVE_LANGUAGE_REASON=required to explain the update
Ignore-AOSP-First: Conflict with git_master.
Need to merge in internal first
Merged-In: I6707def7cca06068fbbf25f1f403bb5fd31eb215
Change-Id: I6707def7cca06068fbbf25f1f403bb5fd31eb215
Martin Brabham [Mon, 12 Oct 2020 20:17:47 +0000 (13:17 -0700)]
Inclusive Language Updates
master -> central
MASTER -> CENTRAL
Master -> Central
BYPASS_INCLUSIVE_LANGUAGE_REASON=required to explain the update
Bug:
170342881
Tag: #refactor
Test: cert/run --host
Test: atest --host bluetooth_test_common
Test: atest --host bluetooth_test_gd
Test: atest net_test_btif
Change-Id: I861ca756f04c06547ee9cb580029404308c678f2
Merged-In: I861ca756f04c06547ee9cb580029404308c678f2
Treehugger Robot [Wed, 14 Oct 2020 16:18:55 +0000 (16:18 +0000)]
Merge "Add aac vbr support for net_test_stack" am:
06aa68f6f8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1455158
Change-Id: I8cc2fdcb188a7b67070290e9a8c1af44a8f64e89
Treehugger Robot [Wed, 14 Oct 2020 15:36:29 +0000 (15:36 +0000)]
Merge "Add aac vbr support for net_test_stack"
Chen Chen [Mon, 12 Oct 2020 20:03:48 +0000 (13:03 -0700)]
Updated SIG wording: whitelist to acceptlist
Bug:
170342881
Tag: #refactor
Test: atest --host bluetooth_test_common
Test: atest --host bluetooth_test_gd
Test: atest net_test_btif
Merged-In: I6707def7cca06068fbbf25f1f403bb5fd31eb215
BYPASS_INCLUSIVE_LANGUAGE_REASON=required to explain the update
Change-Id: I6707def7cca06068fbbf25f1f403bb5fd31eb215
Treehugger Robot [Wed, 14 Oct 2020 02:34:02 +0000 (02:34 +0000)]
Merge "HFP: Open SLC after AT+BIND if HF indicators supported" am:
b549e96242
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458182
Change-Id: Icf0424c5d3c29bb32a386ba0c81bdc724b86a929
Treehugger Robot [Wed, 14 Oct 2020 01:59:27 +0000 (01:59 +0000)]
Merge "HFP: Open SLC after AT+BIND if HF indicators supported"
Chienyuan [Tue, 13 Oct 2020 08:23:59 +0000 (16:23 +0800)]
HFP: Open SLC after AT+BIND if HF indicators supported
If HF indicators is supported by HF and AG. Service Level Connection
shall consider established after the HF has successfully retrieved
information about HF indicators currently enabled by the AG using the
AT+BIND? command.
Bug:
169935138
Test: connect headset during a call
Tag: #compatibility
Change-Id: I67cfac3b035904a2375c77d726a8e16accf2b014
Treehugger Robot [Tue, 13 Oct 2020 22:50:40 +0000 (22:50 +0000)]
Merge "l2c: Fix invalid p_lcb usage" am:
a75531b164
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458302
Change-Id: I077fa1706dd85b8e6b0fa35c6222e3670b946d1c
George Burgess IV [Tue, 13 Oct 2020 16:33:09 +0000 (09:33 -0700)]
bt: don't conditionally dereference an undefined pointer
If `lcids` is empty here, the `p_ccb->p_lcb` access on line 898 uses an
uninitialized pointer. We ideally shouldn't be doing that.
Caught by the static analyzer:
system/bt/stack/l2cap/l2c_api.cc:889:21: warning: Dereference of
undefined pointer value [clang-analyzer-core.NullDereference]
Tag: #security
Bug:
159786353
Test: TreeHugger
Change-Id: Ifbcdb3f2f297b2bf3ff5324b6fb4039fecade43f
Treehugger Robot [Tue, 13 Oct 2020 22:35:02 +0000 (22:35 +0000)]
Merge "l2c: Fix invalid p_lcb usage"
Chris Manton [Tue, 13 Oct 2020 20:51:45 +0000 (20:51 +0000)]
Enum-ify bta/include/bta_gatt_api::tBTA_GATTC_EVT am:
e221d1f418
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458591
Change-Id: I266a0379175926efbb704e4e932071b5b4a35a1e
Chris Manton [Tue, 13 Oct 2020 20:51:42 +0000 (20:51 +0000)]
Add stack/l2cap/l2c_api::l2c_get_transport_from_fixed_cid am:
8c1cdf4dbb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458590
Change-Id: Ib36f662c40e23822340f881c46b27a2d75b85fc8
Chris Manton [Tue, 13 Oct 2020 20:51:39 +0000 (20:51 +0000)]
Add stack/gatt/gatt_main::GattClientEventText am:
1b43d31733
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1458589
Change-Id: I60c7f0626e29620e988775dbaf80858edddccf63