OSDN Git Service
Hansong Zhang [Fri, 9 Oct 2020 17:46:17 +0000 (17:46 +0000)]
DynamicChannelImpl::Close check if it's closed first am:
5afad658bb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1455416
Change-Id: Idddf7c5e463baa09c0a9b70db252ee01298343ff
Hansong Zhang [Thu, 8 Oct 2020 20:07:36 +0000 (13:07 -0700)]
DynamicChannelImpl::Close check if it's closed first
Coule be the case where it's closed, but the client called Close()
before that.
Bug:
167263142
Test: cert/run --host
Tag: #gd-refactor
Change-Id: I5c74081d38e02ece143d7a7ee46606bed83a5f2d
Łukasz Rymanowski [Fri, 9 Oct 2020 14:53:09 +0000 (14:53 +0000)]
stack/l2c: Add support for credit based connection oriented channels am:
4456dc7c91
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1348751
Change-Id: I1bb2dfbb0c69aac353921cc144a6602b67a0f5fe
Łukasz Rymanowski [Sat, 9 May 2020 00:04:46 +0000 (02:04 +0200)]
stack/l2c: Add support for credit based connection oriented channels
This patch adds only support for LE
There is new L2CAP API to create connection and reconfigure connection.
Implementation will always try to create up to 5 channels if possible.
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: compile & manual
Change-Id: I8459a7384ca5771b89b6a5c0bdeeacab86dca5da
Chris Manton [Fri, 9 Oct 2020 07:28:41 +0000 (07:28 +0000)]
Streamline stack/acl/btm_acl::BTM_IsAclConnectionUp am:
7547df3ebf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1455172
Change-Id: I041fc924c3f305c6a226ba6d11e3565b8cd0067b
Chris Manton [Wed, 7 Oct 2020 22:45:07 +0000 (15:45 -0700)]
Streamline stack/acl/btm_acl::BTM_IsAclConnectionUp
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I25899a6ee5a5b36c2731da3dba83179158ae74bb
Treehugger Robot [Fri, 9 Oct 2020 00:08:27 +0000 (00:08 +0000)]
Merge "Restore LE CoC l2cap conn rsp" am:
d0f8a115d8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1455295
Change-Id: Ib115f2215e673eb3d171a6c3704ee5afd99a506d
Treehugger Robot [Thu, 8 Oct 2020 23:37:21 +0000 (23:37 +0000)]
Merge "Restore LE CoC l2cap conn rsp"
Hansong Zhang [Thu, 8 Oct 2020 20:39:20 +0000 (20:39 +0000)]
tL2C_TX_COMPLETE_CB_INFO is unused am:
0afa91e3d2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1447001
Change-Id: I5b9807dde86339dd26cdd181f1a0da8f5079f678
Hansong Zhang [Thu, 8 Oct 2020 20:38:49 +0000 (20:38 +0000)]
L2cap fixed channel tx complete is unused am:
1f6cf09bcd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1447000
Change-Id: I1ebdfc4983fba567d29d1fd1d7c66b9fd1bb361a
Chris Manton [Thu, 8 Oct 2020 16:33:45 +0000 (09:33 -0700)]
Restore LE CoC l2cap conn rsp
L2cap connection response not generated as server
Plus default config options were not being set
Re:
6613113056bcfd8b8c8abcdc337b15e18f7dfc71
Bug:
170396407
Test: Wireshark shows conn rsp being emitted w/default vals
Test: act -tc BleCocTest
Tag: #refactor
Change-Id: I0f696c2e0bac996ae2b9521fdb282577b9e8528a
Hansong Zhang [Fri, 2 Oct 2020 18:26:23 +0000 (11:26 -0700)]
tL2C_TX_COMPLETE_CB_INFO is unused
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5f59b1d3cb903303a76d8e53a189732188d13f56
Hansong Zhang [Fri, 2 Oct 2020 18:21:58 +0000 (11:21 -0700)]
L2cap fixed channel tx complete is unused
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iae3801999b031c904f048acd3e4c27745938b520
Treehugger Robot [Thu, 8 Oct 2020 19:02:44 +0000 (19:02 +0000)]
Merge changes I61791e5b,If25a7f34,I2949e99a,Ie70a5fec am:
a52643b785
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1453082
Change-Id: If02abbd808241b4ec7bc02d8301089d5c0782809
Treehugger Robot [Thu, 8 Oct 2020 18:25:37 +0000 (18:25 +0000)]
Merge changes I61791e5b,If25a7f34,I2949e99a,Ie70a5fec
* changes:
Re-log stack/sdp::process_service_search_attr_rsp
Re-log stack/gatt/gatt_attr::gatt_disc_cmpl_cback
Re-log stack/smp/smp_act::smp_send_app_cback
Check power mode only on classic links
Treehugger Robot [Thu, 8 Oct 2020 17:02:32 +0000 (17:02 +0000)]
Merge "Encryption Key size negotiation - PTS tests" am:
fa84a81ac2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1450736
Change-Id: I030b73309a72416de3b0c4bba5e7cd6cdc057097
Treehugger Robot [Thu, 8 Oct 2020 16:36:06 +0000 (16:36 +0000)]
Merge "Encryption Key size negotiation - PTS tests"
Treehugger Robot [Thu, 8 Oct 2020 16:03:30 +0000 (16:03 +0000)]
Merge "hci: Fix len of the periodic sync info command" am:
fd5744725a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1454816
Change-Id: I8cbd0c82b87ac623c60df660c886c5fb407ea4c6
Chris Manton [Wed, 23 Sep 2020 16:27:13 +0000 (09:27 -0700)]
Re-log stack/sdp::process_service_search_attr_rsp
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I61791e5b50d51abdaffc0f9dd6709b94c816e077
Chris Manton [Wed, 23 Sep 2020 16:26:49 +0000 (09:26 -0700)]
Re-log stack/gatt/gatt_attr::gatt_disc_cmpl_cback
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: If25a7f34f12bf4283e04655daebddc73b3bb3403
Chris Manton [Wed, 23 Sep 2020 16:27:43 +0000 (09:27 -0700)]
Re-log stack/smp/smp_act::smp_send_app_cback
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I2949e99ad5015082556308965b8cb49387af53f2
Chris Manton [Wed, 23 Sep 2020 17:11:30 +0000 (10:11 -0700)]
Check power mode only on classic links
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Ie70a5fecea4909a4755f98b9393843371009a2a3
Treehugger Robot [Thu, 8 Oct 2020 15:14:52 +0000 (15:14 +0000)]
Merge "hci: Fix len of the periodic sync info command"
Łukasz Rymanowski [Thu, 8 Oct 2020 14:35:46 +0000 (14:35 +0000)]
l2cap: Fix missing connection indication am:
e5d04dd0aa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1452678
Change-Id: Id9b2685f6e56ff0ad56e96d23d7ac794bd1b1a38
Łukasz Rymanowski [Thu, 8 Oct 2020 07:48:45 +0000 (07:48 +0000)]
hci: Fix len of the periodic sync info command
Bug:
150670922
Tag: #feature
Test: compile & manual
Sponsor: jpawlowski@
Change-Id: I56065a7b9fcaeff5d3d98e135bed8dfec987ae3b
Jakub Pawlowski [Tue, 6 Oct 2020 18:33:30 +0000 (20:33 +0200)]
Encryption Key size negotiation - PTS tests
This is implementation of remaining Encryption Key Size negotiation PTS
tests.
Bug:
142341141
Tag: #gd-refactor
Test: gd/cert/run --host LeSecurityTest:test_min_encryption_key_size_less_than_min
Change-Id: I9ef35d2ef143b076365b956234febbc2ba668c95
Łukasz Rymanowski [Wed, 7 Oct 2020 14:55:02 +0000 (14:55 +0000)]
l2cap: Fix missing connection indication
Sponsor: jpawlowski
Test: compilation
Change-Id: I42c6dd273527c4420f3466cfd11f8e6c2572e527
Treehugger Robot [Thu, 8 Oct 2020 09:08:53 +0000 (09:08 +0000)]
Merge changes Ie94f7b5a,I7f8cc5a1,I87148e3c am:
6884062653
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1453078
Change-Id: I2ab7dc2ec02fa331fbc87b13159160fd57063f18
Treehugger Robot [Thu, 8 Oct 2020 09:07:55 +0000 (09:07 +0000)]
Merge changes I9dee4893,Id30ad44e,I77837cc5,Iebd60d4e,Ie2237ad8, ... am:
576ec8375d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1453075
Change-Id: Ibe48e3777238fedd7a4bf32897248264a4d19c77
Treehugger Robot [Thu, 8 Oct 2020 08:44:40 +0000 (08:44 +0000)]
Merge changes Ie94f7b5a,I7f8cc5a1,I87148e3c
* changes:
Add Api stack/acl/::btm_pm_is_le_link
Re-log stack/acl/btm_acl::lmp_version_below
Re-log stack/btm/btm_ble::BTM_SetBleDataLength
Treehugger Robot [Thu, 8 Oct 2020 08:39:36 +0000 (08:39 +0000)]
Merge changes I9dee4893,Id30ad44e,I77837cc5,Iebd60d4e,Ie2237ad8, ...
* changes:
Re-log stack/btm/btm_ble::BTM_BleSetPhy
Use common API to set hci handle
Add common API to set hci handle
gd: Add monitor ability to receive packet credits
Move _process_num_completed_pkts into acl
Streamline stack/l2cap/l2c_link::l2c_link_process_num_completed_pkts
Hansong Zhang [Thu, 8 Oct 2020 07:01:24 +0000 (07:01 +0000)]
GD: Enforce link encryption in L2cap am:
ee110cfef1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1443310
Change-Id: I65ef8e87906bdf7b4de719815a464d04cdd9cf73
Chris Manton [Wed, 23 Sep 2020 17:10:31 +0000 (10:10 -0700)]
Add Api stack/acl/::btm_pm_is_le_link
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: Ie94f7b5a91e75aff552c1686fdd9f143c4337ea2
Chris Manton [Wed, 23 Sep 2020 16:08:11 +0000 (09:08 -0700)]
Re-log stack/acl/btm_acl::lmp_version_below
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I7f8cc5a16178e0c1fc88bf31ba1207186bec6d48
Chris Manton [Wed, 23 Sep 2020 15:50:18 +0000 (08:50 -0700)]
Re-log stack/btm/btm_ble::BTM_SetBleDataLength
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I87148e3c932c671111f5a61f3a178275e9d86804
Chris Manton [Wed, 23 Sep 2020 15:07:55 +0000 (08:07 -0700)]
Re-log stack/btm/btm_ble::BTM_BleSetPhy
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: act.py -tc BleCocTest
Change-Id: I9dee4893066ed0a80a4dac652d622909a05416fd
Chris Manton [Tue, 22 Sep 2020 17:40:21 +0000 (10:40 -0700)]
Use common API to set hci handle
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id30ad44e8084effd204f168cf3983da8ab31e064
Chris Manton [Tue, 22 Sep 2020 17:18:01 +0000 (10:18 -0700)]
Add common API to set hci handle
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I77837cc51daaca9f89c8b5d83aa84996b2d9e38f
Chris Manton [Tue, 6 Oct 2020 23:14:55 +0000 (16:14 -0700)]
gd: Add monitor ability to receive packet credits
Primarily used for acl shim
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Iebd60d4e41b45895aed0f7daf60941a1dff2ff59
Chris Manton [Mon, 5 Oct 2020 20:49:56 +0000 (13:49 -0700)]
Move _process_num_completed_pkts into acl
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ie2237ad8b5ed76c024276a5c2db63c0809c680d9
Chris Manton [Mon, 5 Oct 2020 20:19:24 +0000 (13:19 -0700)]
Streamline stack/l2cap/l2c_link::l2c_link_process_num_completed_pkts
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I1d6072e5f526c7f2ac1b3229c2e4bdbcdbf3d083
Hansong Zhang [Thu, 1 Oct 2020 19:09:57 +0000 (12:09 -0700)]
GD: Enforce link encryption in L2cap
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Change-Id: I2cbeeab04ba23c6575f9042fd2785c2c427ce200
Treehugger Robot [Thu, 8 Oct 2020 03:16:12 +0000 (03:16 +0000)]
Merge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ... am:
2069e3d00d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1452080
Change-Id: Ic2157a5036c97323a32e977154f7d819805ac5f4
Treehugger Robot [Thu, 8 Oct 2020 02:53:20 +0000 (02:53 +0000)]
Merge changes Ie0f33c90,I683d6803,I908ff98f,I0a6c26c9,I392dac8b, ...
* changes:
Re-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete
Move btm_ble_increment_link_topology_mask l2c=>btm
Streamline conditional stack/btm/btm_ble::btm_ble_connected
enum-ify tL2CAP_LE_RESULT_
Add api around select fields tL2C_CB::tL2C_LCB::
enum-ify stack/include/l2c_api::L2CAP_PRIORITY_
Hansong Zhang [Thu, 8 Oct 2020 00:53:14 +0000 (00:53 +0000)]
AVRCP: Advance iterator before deleting it am:
6370db8086
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1453980
Change-Id: I9418060d15bad8a2fb9b78e6581713d67ea0348b
Hansong Zhang [Wed, 7 Oct 2020 21:50:15 +0000 (14:50 -0700)]
AVRCP: Advance iterator before deleting it
When we invoke instance_->avrc_->Close(), it will invoke the callback in
AcceptorControlCb by the state machine from AVCT, and the iterator will
be deleted. Now we advanece the iterator first.
Bug:
169747177
Test: Connect to a speaker with AVRCP, and turn off Bluetooth
Tag: #stability
Change-Id: If4ed403d355242da48b7ee49dd74784f43de1b1d
Treehugger Robot [Thu, 8 Oct 2020 00:17:35 +0000 (00:17 +0000)]
Merge "shim/l2cap: Fix RegisterLECoc function" am:
27d85b2dbd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1452677
Change-Id: I173f7f20a996e9c2d4240cc88640578d763be1b2
Treehugger Robot [Thu, 8 Oct 2020 00:02:41 +0000 (00:02 +0000)]
Merge "shim/l2cap: Fix RegisterLECoc function"
Chris Manton [Tue, 22 Sep 2020 16:08:46 +0000 (09:08 -0700)]
Re-log stack/btm/btm_ble_gap::btm_ble_read_remote_features_complete
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ie0f33c905783981c92b06f5ea5718d49365200af
Chris Manton [Tue, 22 Sep 2020 02:13:47 +0000 (19:13 -0700)]
Move btm_ble_increment_link_topology_mask l2c=>btm
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I683d68030531bbc635c5f357a8cc356d925d40c8
Chris Manton [Tue, 22 Sep 2020 02:09:34 +0000 (19:09 -0700)]
Streamline conditional stack/btm/btm_ble::btm_ble_connected
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I908ff98f333e173762d25b1e6820db7a433af3af
Chris Manton [Mon, 5 Oct 2020 05:44:39 +0000 (22:44 -0700)]
enum-ify tL2CAP_LE_RESULT_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I0a6c26c962277607c5447619d64ce95b47a33311
Chris Manton [Tue, 6 Oct 2020 17:37:29 +0000 (10:37 -0700)]
Add api around select fields tL2C_CB::tL2C_LCB::
tL2C_CB::tL2C_LCB::link_xmit_quota
tL2C_CB::tL2C_LCB::round_robin_unacked
tL2C_CB::tL2C_LCB::ble_round_robin_unacked
tL2C_CB::tL2C_LCB::acl_priority
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I392dac8bd8fb33cf8350a7fac1d160595c54ed1c
Chris Manton [Tue, 6 Oct 2020 17:09:58 +0000 (10:09 -0700)]
enum-ify stack/include/l2c_api::L2CAP_PRIORITY_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6d0f97493f407f1a4e32bc12434ec5c3c3b8ef54
Jack He [Wed, 7 Oct 2020 20:49:12 +0000 (20:49 +0000)]
Merge "GD-HCI: Change command and event logs from INFO to DEBUG" am:
9e8e3b84ff
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1451280
Change-Id: I8f74156d59c6c25c1a15b7bb6089a7433296e00a
Jack He [Wed, 7 Oct 2020 20:48:49 +0000 (20:48 +0000)]
Merge "GD-HCI: Change StopWatch log from INFO to DEBUG" am:
f1ea5e9c9e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1451112
Change-Id: I373e228f14c125ed864a809e0e87b41e92cb48f0
Jack He [Wed, 7 Oct 2020 20:48:05 +0000 (20:48 +0000)]
Merge "GD-Logging: Add INIT flags to configure debug logging" am:
10a1228882
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449497
Change-Id: Ie7a1952b5e3d425d6e4a36039dec05464f02f3ba
Jack He [Wed, 7 Oct 2020 20:26:59 +0000 (20:26 +0000)]
Merge "GD-HCI: Change command and event logs from INFO to DEBUG"
Jack He [Wed, 7 Oct 2020 20:26:51 +0000 (20:26 +0000)]
Merge "GD-HCI: Change StopWatch log from INFO to DEBUG"
Jack He [Wed, 7 Oct 2020 20:25:40 +0000 (20:25 +0000)]
Merge "GD-Logging: Add INIT flags to configure debug logging"
Łukasz Rymanowski [Fri, 2 Oct 2020 09:35:38 +0000 (09:35 +0000)]
shim/l2cap: Fix RegisterLECoc function
Change-Id: I6079b1456580f9f49aa18396177e2eef0d9e1398
Jakub Pawlowski [Wed, 7 Oct 2020 07:56:51 +0000 (07:56 +0000)]
Merge "Implement encryption key size negotiation" am:
0baf4f2baf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449336
Change-Id: I4dbfd5159eab0eaee9126a208b77d190dfaabfb3
Jakub Pawlowski [Wed, 7 Oct 2020 07:44:35 +0000 (07:44 +0000)]
GD: Store peer keys in legacy format am:
7c1847ad0d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1446676
Change-Id: Ib4c4c14357f1dc6a4f3b2235b7a03946babe91dd
Jakub Pawlowski [Wed, 7 Oct 2020 06:16:54 +0000 (06:16 +0000)]
Merge "Implement encryption key size negotiation"
Jakub Pawlowski [Thu, 1 Oct 2020 13:12:25 +0000 (15:12 +0200)]
GD: Store peer keys in legacy format
Bug:
142341141
Tag: #gd-refactor
Test: cert/run --host SecurityRecordStorageTest
Change-Id: I94d270da66977fef6356f011b649bb405d0c4324
Jack He [Tue, 6 Oct 2020 23:31:45 +0000 (23:31 +0000)]
Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO" am:
318e323516
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449401
Change-Id: Ic5a9b79fff00f841e4a1ce81074525129340ae5f
Jakub Pawlowski [Mon, 5 Oct 2020 18:29:24 +0000 (20:29 +0200)]
Implement encryption key size negotiation
Bug:
142341141
Tag: #gd-refactor
Test: gd/cert/run --host LeSecurityTest:test_min_encryption_key_size_equal_to_max
Change-Id: I478d29cf20537075ef2a3dc9f707040e0b657ae1
Jack He [Tue, 6 Oct 2020 22:56:19 +0000 (22:56 +0000)]
Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO"
Jack He [Tue, 6 Oct 2020 22:52:40 +0000 (15:52 -0700)]
GD-HCI: Change command and event logs from INFO to DEBUG
* So that they are not enabled by default
Bug:
164932634
Tag: #gd-refactor
Test: manual testing
Change-Id: I9ff67922b0305cd6397d497dccd038e0444a1d03
Jack He [Tue, 6 Oct 2020 22:23:28 +0000 (15:23 -0700)]
GD-HCI: Change StopWatch log from INFO to DEBUG
* So that it is disabled by default
Bug:
164973960
Test: manual testing
Tag: #gd-refactor
Change-Id: If65ff532621f53f9ccf554121d702c3c41da5a96
Xin Li [Tue, 6 Oct 2020 20:24:35 +0000 (20:24 +0000)]
Merge "DO NOT MERGE - Merge RP1A.201005.006" am:
822d747312
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449399
Change-Id: Ie5a10fc0a5ce58f2ee6494d5d8ee46b8f928873d
The Android Open Source Project [Tue, 6 Oct 2020 20:23:54 +0000 (20:23 +0000)]
DO NOT MERGE - Merge RP1A.201005.006 am:
9e1ebdf522
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449399
Change-Id: If1877b2c672daaec5e8b8b5cb191ffd9621d96c0
Xin Li [Tue, 6 Oct 2020 20:17:27 +0000 (20:17 +0000)]
Merge "DO NOT MERGE - Merge RP1A.201005.006"
Jack He [Mon, 5 Oct 2020 23:38:37 +0000 (16:38 -0700)]
GD-Logging: Add INIT flags to configure debug logging
* Three flags:
- INIT_logging_debug_enabled_for_all
- INIT_logging_debug_enabled_for_tags
- INIT_logging_debug_disabled_for_tags
* If a tag is explicitly disabled or enabled, we will follow that
setting. Otherwise, we check the global enable flag
* This setup allows us to enable/disable individual tags as well as
enable or disable debug logging for all tags
* This affects only DEBUG and VERBOSE level logs
Bug:
170163727
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Idb99ef1ca0a2d14c73069fcba396ac76a61ee39d
Jack He [Tue, 6 Oct 2020 05:50:55 +0000 (22:50 -0700)]
GD-Logging: Change LOG_DEBUG to LOG_INFO
* Given that LOG_DEBUG will be disabled by default,
changing existing LOG_DEBUG to LOG_INFO so that
we don't lose these logs
Bug:
170163727
Test: atest bluetooth_test_gd, manual device test
Tag: #gd-refactor
Change-Id: I84db7751d4bbe6d3ea88122b8cdf72bc150fbe7a
Treehugger Robot [Tue, 6 Oct 2020 18:53:54 +0000 (18:53 +0000)]
Merge "bthal: Do not allow to initialize more than once" am:
38f08d2724
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439972
Change-Id: Ie58c10ceec2164864233b3f0dd22c82b33373a42
Chris Manton [Tue, 6 Oct 2020 18:52:42 +0000 (18:52 +0000)]
Properly shim controller flags am:
5a691a0901
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449737
Change-Id: I96b11a58c4ded5981fd79158618eae4b75824d13
Treehugger Robot [Tue, 6 Oct 2020 18:27:28 +0000 (18:27 +0000)]
Merge "bthal: Do not allow to initialize more than once"
The Android Open Source Project [Tue, 6 Oct 2020 04:00:27 +0000 (21:00 -0700)]
DO NOT MERGE - Merge RP1A.201005.006
Bug:
168212094
Merged-In: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Change-Id: I1be981905f9b5c60b9fc0071200116a368996e00
Chris Manton [Tue, 6 Oct 2020 09:04:37 +0000 (09:04 +0000)]
Re-log stack/l2cap/l2c_ble::l2cble_conn_comp am:
8bfbb8ba24
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449261
Change-Id: I7afeba21452f1df39a8a954449a6e57a30cb47db
Chris Manton [Tue, 6 Oct 2020 09:04:33 +0000 (09:04 +0000)]
Legacy ACL shim interface am:
035379ba7d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449260
Change-Id: Ia74a6217fcd7bcb1ff6bf983bae2d71b354862f3
Chris Manton [Tue, 6 Oct 2020 09:04:29 +0000 (09:04 +0000)]
Remove unused #defs stack/include/hcidefs am:
95f188f34a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449259
Change-Id: I7b6b15938feb86e90510997f5fcfd30d4b58ca8e
Chris Manton [Tue, 6 Oct 2020 09:04:25 +0000 (09:04 +0000)]
Remove unused #defs stack/include/bt_types am:
b96d27a064
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449258
Change-Id: Ic298f9707ecc60794a6345de458d95e5b1be803a
Chris Manton [Tue, 6 Oct 2020 09:04:21 +0000 (09:04 +0000)]
Remove unused var tBTM_SEC_DEV_REC::link_key_changed am:
593ddc1451
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449257
Change-Id: I4ff7ad5f1fdfb8a02576f4ccf132d8b5fae6d0fb
Chris Manton [Tue, 6 Oct 2020 09:04:17 +0000 (09:04 +0000)]
Streamline stack/l2cap/l2c_ble::l2cble_notify_le_connection am:
9bc4e5285e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449256
Change-Id: Ib576a2c869e8c9f630542167abc78a555a2bf578
Chris Manton [Tue, 6 Oct 2020 09:04:13 +0000 (09:04 +0000)]
Add stack/include/bt_types::AddressTypeText am:
8d20e0414d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1449255
Change-Id: I7df1998d74f3a96d8e285b9c04fcede36d14ed58
Chris Manton [Tue, 6 Oct 2020 09:04:09 +0000 (09:04 +0000)]
Re-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr am:
0b50fcee28
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448175
Change-Id: Ibe8289128d4652458b3bb1b28272da51dfe24cc5
Chris Manton [Tue, 6 Oct 2020 09:04:05 +0000 (09:04 +0000)]
Re-log stack/acl/btm_acl am:
4ec5ab73b0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448162
Change-Id: Ia70167abb45e2b836aae8fe5b7033312aef3e386
Chris Manton [Tue, 6 Oct 2020 09:04:01 +0000 (09:04 +0000)]
Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE am:
9ef98020f1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448163
Change-Id: Id8ee2396961663244c7b1de5ff6f5f5a8536eb3c
Chris Manton [Tue, 6 Oct 2020 09:03:58 +0000 (09:03 +0000)]
Simplify StackAclBtmAcl::btm_bda_to_acl am:
f52496654c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448161
Change-Id: I2faf3cf4bac158baff419262060e9aee98bb6b4c
Chris Manton [Tue, 6 Oct 2020 09:03:25 +0000 (09:03 +0000)]
Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr am:
95772843cb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1448160
Change-Id: I4760a7d62ed76c895b14df6b8f5e44739428d02c
Chris Manton [Tue, 6 Oct 2020 00:32:51 +0000 (17:32 -0700)]
Properly shim controller flags
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I7d311bda8d86ca87032d8a45d35ab4d00a5d4038
Chris Manton [Mon, 21 Sep 2020 20:57:11 +0000 (13:57 -0700)]
Re-log stack/l2cap/l2c_ble::l2cble_conn_comp
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6dfd621e83868b36fdb1ac16825db8176600adb9
Chris Manton [Mon, 5 Oct 2020 17:07:15 +0000 (10:07 -0700)]
Legacy ACL shim interface
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I2aaa3459e9537a896b374aa2a3eac85aaf1ea30c
Chris Manton [Mon, 21 Sep 2020 15:20:28 +0000 (08:20 -0700)]
Remove unused #defs stack/include/hcidefs
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I6b657cf604fac0e3fdb4e51b071c02b451f6e95c
Chris Manton [Mon, 21 Sep 2020 00:41:54 +0000 (17:41 -0700)]
Remove unused #defs stack/include/bt_types
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Iff89e74e95d78fe5cf053ca20fead3076fd18cdf
Chris Manton [Sun, 20 Sep 2020 23:30:42 +0000 (16:30 -0700)]
Remove unused var tBTM_SEC_DEV_REC::link_key_changed
set-once-to-default-read-never
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ife93f8028096744171ae79f2d8608c87e352eff0
Chris Manton [Sat, 3 Oct 2020 16:22:57 +0000 (09:22 -0700)]
Streamline stack/l2cap/l2c_ble::l2cble_notify_le_connection
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I1ffb5df7acd8f616822ec3eeacef7d88d6dbc249
Chris Manton [Mon, 21 Sep 2020 21:00:48 +0000 (14:00 -0700)]
Add stack/include/bt_types::AddressTypeText
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I43b7c46837435ea544eb2e8c90ef981a3bdf3e2f
Chris Manton [Sun, 4 Oct 2020 22:03:38 +0000 (15:03 -0700)]
Re-Api stack/acl/btm_acl::btm_ble_get_acl_remote_addr
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1ba3ec9198e9832e323da0e8b6e604eb8c8c1c81