OSDN Git Service
Hansong Zhang [Fri, 25 Sep 2020 05:47:15 +0000 (05:47 +0000)]
AVDT MTU is fixed am:
94722f9372 am:
9b6deb86e6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438053
Change-Id: I9a24466b9867a676b5fb4d2754b8eb07b3914854
Hansong Zhang [Fri, 25 Sep 2020 05:47:07 +0000 (05:47 +0000)]
AVRC_BR uses the same mtu am:
810f878b5a am:
5e76768733
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438052
Change-Id: If482a10ffc4d2784f060979a6f0c7859ddb17d88
Hansong Zhang [Fri, 25 Sep 2020 05:47:01 +0000 (05:47 +0000)]
AVRC uses the same mtu (part 2) am:
6e25c080da am:
77baf15141
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437714
Change-Id: I2c7e28af065d988265d4ab449cf4b64bebf43532
Hansong Zhang [Fri, 25 Sep 2020 05:46:59 +0000 (05:46 +0000)]
AVRC uses the same mtu am:
0ae5bb34fd am:
c4d63071f4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437713
Change-Id: Ia30f5648b42541fe10c79fff94c0d0852c4cc199
Hansong Zhang [Fri, 25 Sep 2020 05:46:52 +0000 (05:46 +0000)]
We can't bypass FCS am:
9bc2e8608f am:
6f4ca5bf59
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437473
Change-Id: I35693002a6a616e76a3b8fbb26031112154eff28
Hansong Zhang [Fri, 25 Sep 2020 05:46:50 +0000 (05:46 +0000)]
p_ccb->bypass_fcs is never satisfied am:
772cf45701 am:
2ed2cc8114
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437472
Change-Id: I8c0e1249c280e00fd875600fc4ffef305de96cbd
Hansong Zhang [Fri, 25 Sep 2020 05:46:48 +0000 (05:46 +0000)]
L2CAP: We never explicitly disable FCS am:
be38658455 am:
5a705e6187
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437471
Change-Id: I034b2adcaccf9f21c0785e6cd5a34c6c209d48b1
Treehugger Robot [Fri, 25 Sep 2020 05:46:21 +0000 (05:46 +0000)]
Merge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c am:
cd9e8dc741 am:
be7615441f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437478
Change-Id: Ic9775697156b593f641d2465ad3c03c59ff9663c
Hansong Zhang [Fri, 25 Sep 2020 05:44:41 +0000 (05:44 +0000)]
AVDT MTU is fixed am:
94722f9372
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438053
Change-Id: Ib7dd455bf705071c82f31e3ebb51aa0b26ef047d
Hansong Zhang [Fri, 25 Sep 2020 05:44:30 +0000 (05:44 +0000)]
AVRC_BR uses the same mtu am:
810f878b5a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438052
Change-Id: Ia81def4d5e9f6026267a6629a415cf7e4482992c
Hansong Zhang [Fri, 25 Sep 2020 05:44:22 +0000 (05:44 +0000)]
AVRC uses the same mtu (part 2) am:
6e25c080da
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437714
Change-Id: I99d3b36e97f06f5f5c0dc60800af0cb09e9d1cf8
Hansong Zhang [Fri, 25 Sep 2020 05:44:17 +0000 (05:44 +0000)]
AVRC uses the same mtu am:
0ae5bb34fd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437713
Change-Id: Idbbacce00faeb0a1261093887a907ecba6f16f3a
Hansong Zhang [Fri, 25 Sep 2020 05:44:00 +0000 (05:44 +0000)]
We can't bypass FCS am:
9bc2e8608f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437473
Change-Id: I9fd3781e45446293fa51a0c76d21c34aae0ea146
Hansong Zhang [Fri, 25 Sep 2020 05:43:56 +0000 (05:43 +0000)]
p_ccb->bypass_fcs is never satisfied am:
772cf45701
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437472
Change-Id: I1f52a14411af18bc5df396dd9c5c18bc9f9fb598
Hansong Zhang [Fri, 25 Sep 2020 05:43:01 +0000 (05:43 +0000)]
L2CAP: We never explicitly disable FCS am:
be38658455
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437471
Change-Id: I84852d90b80d5da0066a200326e658782bf681ec
Treehugger Robot [Fri, 25 Sep 2020 05:26:33 +0000 (05:26 +0000)]
Merge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c am:
cd9e8dc741
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437478
Change-Id: I91b7c472cc8c6d82f59a708b16314fc66475c97c
Hansong Zhang [Thu, 24 Sep 2020 22:15:18 +0000 (15:15 -0700)]
AVDT MTU is fixed
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iad9e204602f643a820c982e46d24539b4595f84f
Hansong Zhang [Thu, 24 Sep 2020 20:33:56 +0000 (13:33 -0700)]
AVRC_BR uses the same mtu
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4a22ec350f1feff0c443dd411e223f6a58a5b282
Hansong Zhang [Thu, 24 Sep 2020 20:16:11 +0000 (13:16 -0700)]
AVRC uses the same mtu (part 2)
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie7e5be1bd0b1c94aac122aedf3ee05dac45e386e
Hansong Zhang [Thu, 24 Sep 2020 20:12:22 +0000 (13:12 -0700)]
AVRC uses the same mtu
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I365e3ab3a2f7ee223e9242c2643ce51235a02d6b
Hansong Zhang [Thu, 24 Sep 2020 03:40:13 +0000 (20:40 -0700)]
We can't bypass FCS
Note that in the case where the peer doesn't support FCS, we still send
FCS. This is an existing behavior and we keep it the same for now.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0803d07122990b5266a1669f3d7e1f3056d9a114
Hansong Zhang [Thu, 24 Sep 2020 03:32:50 +0000 (20:32 -0700)]
p_ccb->bypass_fcs is never satisfied
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifc0342c2e9261c8328216379218d88f40bc7eda1
Hansong Zhang [Thu, 24 Sep 2020 03:29:22 +0000 (20:29 -0700)]
L2CAP: We never explicitly disable FCS
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If90d75c969277137d356617dec9b8f5c02c5d3f3
Treehugger Robot [Thu, 24 Sep 2020 21:53:33 +0000 (21:53 +0000)]
Merge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c
* changes:
Add stack/include/avdt_api::peer_stream_endpoint_text
Re-log btif/src/btif_sock_l2cap
Add Api for tACL_CB::tACL_CONN::transport
Complete hci errorcode text
Myles Watson [Thu, 24 Sep 2020 21:52:22 +0000 (21:52 +0000)]
DirectHciTest: Accept more events am:
aed10eff6e am:
edbcee412a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436373
Change-Id: I0360b9cab0099673703b1b66380a66d603a5321d
Myles Watson [Thu, 24 Sep 2020 21:24:53 +0000 (21:24 +0000)]
DirectHciTest: Accept more events am:
aed10eff6e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436373
Change-Id: I72b797ecc1a053f70d0b001e927d98d7efef05c7
Chris Manton [Sat, 19 Sep 2020 20:55:33 +0000 (13:55 -0700)]
Add stack/include/avdt_api::peer_stream_endpoint_text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Id7a14929d04cc1f63b4482f8a9fa47e79711a045
Chris Manton [Sat, 19 Sep 2020 18:01:07 +0000 (11:01 -0700)]
Re-log btif/src/btif_sock_l2cap
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ib01088d73a5735b650216cd174208788adf9ba65
Chris Manton [Sat, 19 Sep 2020 21:08:21 +0000 (14:08 -0700)]
Add Api for tACL_CB::tACL_CONN::transport
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I3c46c8ecf15a382e0234013626312d5c8cc3ecb2
Chris Manton [Thu, 24 Sep 2020 00:28:56 +0000 (17:28 -0700)]
Complete hci errorcode text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ib71ed35ce4495db3a869cf6e7b52a9b815e46b58
Myles Watson [Wed, 23 Sep 2020 13:19:43 +0000 (06:19 -0700)]
DirectHciTest: Accept more events
Test: cert/run --host
Bug:
145832107
Tag: #gd-refactor
Change-Id: I19fb16bea62ad444c67b33343bffd3c2cc85f6bd
Hansong Zhang [Thu, 24 Sep 2020 07:29:24 +0000 (07:29 +0000)]
BNEP: Always use BNEP_MTU_SIZE as remote MTU size am:
6d23e9f28b am:
b07dd570d1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436435
Change-Id: I56d3cfd78fafa3ebf718242e6dd140e53b6a3821
Hansong Zhang [Thu, 24 Sep 2020 07:29:22 +0000 (07:29 +0000)]
BNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE am:
4f72bc0ff3 am:
e5dd31c4e8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436434
Change-Id: I942daed1de73ef99ad958a4c60d77c288e353a62
Hansong Zhang [Thu, 24 Sep 2020 07:29:13 +0000 (07:29 +0000)]
SDP: FCR mode is checked in L2cap layer am:
d581fc8a55 am:
bda42151bb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435847
Change-Id: I6ea86e2c0045bca827aed10e0ae7ada559fd2087
Hansong Zhang [Thu, 24 Sep 2020 07:29:11 +0000 (07:29 +0000)]
Remove already handled case am:
5a3ea66dff am:
6261a08c7b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435846
Change-Id: Ia2c97f0948f08a6d7248587e14a4b1f5db8c4f37
Hansong Zhang [Thu, 24 Sep 2020 07:29:09 +0000 (07:29 +0000)]
L2CAP: Allowed mode is equivalent to preferred mode am:
dea3f23a21 am:
f82841c407
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435845
Change-Id: I3f924029b61a9b7a36b4b7ac2c38ad424dfce07e
Hansong Zhang [Thu, 24 Sep 2020 07:28:43 +0000 (07:28 +0000)]
Remove L2CAP_FCR_STREAM_MODE related function am:
0784dff159 am:
840076d554
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435844
Change-Id: If44bc574440faf176253d0c6016bb4553283ed74
Hansong Zhang [Thu, 24 Sep 2020 07:28:41 +0000 (07:28 +0000)]
L2CAP_FCR_STREAM_MODE is never used am:
186c7d13c8 am:
8f4fed02f0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435843
Change-Id: I868e85903aa78fad56a506a8a4327b73da1535a2
Hansong Zhang [Thu, 24 Sep 2020 07:28:38 +0000 (07:28 +0000)]
AVCT_BR always uses L2CAP_FCR_ERTM_MODE am:
b744aeeb13 am:
e18bf0b7d3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435842
Change-Id: I7386118d08f55c90d5e240b0499730037ae26bda
Hansong Zhang [Thu, 24 Sep 2020 07:15:36 +0000 (07:15 +0000)]
BNEP: Always use BNEP_MTU_SIZE as remote MTU size am:
6d23e9f28b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436435
Change-Id: I64ac9f1e09952a1f0258ee0c39297a531ee1c141
Hansong Zhang [Thu, 24 Sep 2020 07:15:33 +0000 (07:15 +0000)]
BNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE am:
4f72bc0ff3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436434
Change-Id: Ieb3c8aaddaf117c217d5ff3708ad051ed63f64f5
Hansong Zhang [Thu, 24 Sep 2020 07:14:46 +0000 (07:14 +0000)]
SDP: FCR mode is checked in L2cap layer am:
d581fc8a55
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435847
Change-Id: I2f2c03bab369e962b79c842f5af8b7ad083e4c0c
Hansong Zhang [Thu, 24 Sep 2020 07:14:42 +0000 (07:14 +0000)]
Remove already handled case am:
5a3ea66dff
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435846
Change-Id: Iabe231a958cf615e9749e6fec8cdb4aae1f7dfbe
Hansong Zhang [Thu, 24 Sep 2020 07:14:38 +0000 (07:14 +0000)]
L2CAP: Allowed mode is equivalent to preferred mode am:
dea3f23a21
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435845
Change-Id: I7f76425ad3b9e85fda85553e79cf37c7059ffb6e
Hansong Zhang [Thu, 24 Sep 2020 07:13:53 +0000 (07:13 +0000)]
Remove L2CAP_FCR_STREAM_MODE related function am:
0784dff159
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435844
Change-Id: Ib16404d1689f07ffaf0e250839bed0018fcaa5f3
Hansong Zhang [Thu, 24 Sep 2020 07:13:49 +0000 (07:13 +0000)]
L2CAP_FCR_STREAM_MODE is never used am:
186c7d13c8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435843
Change-Id: I30a4cbba5077316784caac2fc9a8f404db855fdf
Hansong Zhang [Thu, 24 Sep 2020 07:13:03 +0000 (07:13 +0000)]
AVCT_BR always uses L2CAP_FCR_ERTM_MODE am:
b744aeeb13
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435842
Change-Id: I83a5cc94ebd794b50d83161208845a3aea69a71d
Hansong Zhang [Thu, 24 Sep 2020 03:25:28 +0000 (03:25 +0000)]
L2cap: Store MTU and ERTM info during registration am:
11d4544b0a am:
ef37c2c9f6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435841
Change-Id: I2726a51f7a5cd30fd50af4efd83203acc5b892c2
Hansong Zhang [Thu, 24 Sep 2020 03:25:26 +0000 (03:25 +0000)]
SDP_FLUSH_TO is always 0xFFFF (L2cap default) am:
88a4aac0cc am:
19164f1809
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435840
Change-Id: I08ad421fe4fc7553f0e5c19ca67ca6b991a094a1
Hansong Zhang [Thu, 24 Sep 2020 03:25:25 +0000 (03:25 +0000)]
SDP: We always use basic mode am:
738ceb5df3 am:
d733b3ada8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435839
Change-Id: I789d47d46df02a722a6483f55292bc6da94fa12b
Hansong Zhang [Thu, 24 Sep 2020 03:25:22 +0000 (03:25 +0000)]
RFCOMM code minor clean up am:
4d9eeb522b am:
09bbc3fa56
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435838
Change-Id: I4533f25b4ac874dcd3bae72bce37781d790b3ee2
Hansong Zhang [Thu, 24 Sep 2020 02:51:45 +0000 (02:51 +0000)]
L2cap: Store MTU and ERTM info during registration am:
11d4544b0a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435841
Change-Id: I9ec6a43ec0965631081eaa89b22963649e1da7e5
Hansong Zhang [Thu, 24 Sep 2020 02:51:42 +0000 (02:51 +0000)]
SDP_FLUSH_TO is always 0xFFFF (L2cap default) am:
88a4aac0cc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435840
Change-Id: I20a6b8c6c3ca62b4d0dd4f132674f4e9b7b89d0a
Hansong Zhang [Thu, 24 Sep 2020 02:51:38 +0000 (02:51 +0000)]
SDP: We always use basic mode am:
738ceb5df3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435839
Change-Id: Ifc073a5040efbc9614edfdaab641b7706fb4fc91
Hansong Zhang [Thu, 24 Sep 2020 02:51:03 +0000 (02:51 +0000)]
RFCOMM code minor clean up am:
4d9eeb522b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435838
Change-Id: I4ab0e0efc9fe0eefcf2d44ec0f59ea4a50d07238
Hansong Zhang [Thu, 24 Sep 2020 02:19:35 +0000 (19:19 -0700)]
BNEP: Always use BNEP_MTU_SIZE as remote MTU size
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4462455539f1801b3b9960e822caa56b25699ed6
Hansong Zhang [Thu, 24 Sep 2020 02:17:21 +0000 (19:17 -0700)]
BNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE
Just use one const.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib7239f21ea4f3270268d0c206b695150097cff7f
Hansong Zhang [Thu, 24 Sep 2020 00:35:10 +0000 (17:35 -0700)]
SDP: FCR mode is checked in L2cap layer
In l2c_fcr_process_peer_cfg_req.
L2cap layer sends config response for you.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I841c8f23c15004cd6aade3b2ce8803cf4dd88909
Hansong Zhang [Thu, 24 Sep 2020 00:29:34 +0000 (17:29 -0700)]
Remove already handled case
Handled in `p_cfg->fcr.mode == L2CAP_FCR_BASIC_MODE` case.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I08cd4d60930ab0bc9bd49e0242c27facec1d4fc5
Hansong Zhang [Thu, 24 Sep 2020 00:25:39 +0000 (17:25 -0700)]
L2CAP: Allowed mode is equivalent to preferred mode
In all use cases, we want one BASIC or ERTM exculsively, but we never
allow "both are ok" mode.
Remove allowed_mode. Use preferred_mode to denote the desired mode.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I846eca1912fc9ea04dfa57c5698039d62e634186
Hansong Zhang [Wed, 23 Sep 2020 23:55:23 +0000 (16:55 -0700)]
Remove L2CAP_FCR_STREAM_MODE related function
We never enter this mode.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I604b507b0b703561f4e56240296c3cc46cfcb700
Hansong Zhang [Wed, 23 Sep 2020 23:54:05 +0000 (16:54 -0700)]
L2CAP_FCR_STREAM_MODE is never used
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ieababd683bb4379b67b3da540c190624a81ef89c
Hansong Zhang [Wed, 23 Sep 2020 23:51:40 +0000 (16:51 -0700)]
AVCT_BR always uses L2CAP_FCR_ERTM_MODE
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I97f3c5cba1595202c62909f505bf5a23520ae293
Hansong Zhang [Wed, 23 Sep 2020 22:38:40 +0000 (15:38 -0700)]
L2cap: Store MTU and ERTM info during registration
So that L2cap can auto respond to config req/rsp.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8b68bd2d0e200a5dae9936ab46a259442987f219
Hansong Zhang [Wed, 23 Sep 2020 22:14:14 +0000 (15:14 -0700)]
SDP_FLUSH_TO is always 0xFFFF (L2cap default)
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I47ea25194816a9aebf64c2e7eea3ff329cd3624e
Hansong Zhang [Wed, 23 Sep 2020 22:12:42 +0000 (15:12 -0700)]
SDP: We always use basic mode
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9510a361a5aaf4a85c25a548f7501efe4c9221d5
Hansong Zhang [Wed, 23 Sep 2020 22:12:06 +0000 (15:12 -0700)]
RFCOMM code minor clean up
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia9b0bda9187577201a3face014a03a53950a7cce
Treehugger Robot [Thu, 24 Sep 2020 00:58:21 +0000 (00:58 +0000)]
Merge "RootCanal: Set event masks" am:
aef2d91113 am:
67bf2e33b7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436372
Change-Id: Id34036de80eee531f5902d03001f28ee8fa075ff
Treehugger Robot [Thu, 24 Sep 2020 00:58:10 +0000 (00:58 +0000)]
Merge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ... am:
ff1b628212 am:
ff98a4915a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435762
Change-Id: I8b8eddece7c10bc6455e1bfa88f582b5a3e40c60
Treehugger Robot [Thu, 24 Sep 2020 00:48:46 +0000 (00:48 +0000)]
Merge "RootCanal: Set event masks" am:
aef2d91113
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436372
Change-Id: If3384b220c93396d024b026f550cf1e0c6e1c069
Treehugger Robot [Thu, 24 Sep 2020 00:43:51 +0000 (00:43 +0000)]
Merge "RootCanal: Set event masks"
Treehugger Robot [Thu, 24 Sep 2020 00:40:20 +0000 (00:40 +0000)]
Merge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ... am:
ff1b628212
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435762
Change-Id: Icc8fb89c3d59f962dc3d9bbe23e0808e57554508
Treehugger Robot [Wed, 23 Sep 2020 23:48:50 +0000 (23:48 +0000)]
Merge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ...
* changes:
Re-log bta/gatt::bta_gattc_conn_cback
Re-include btif/src/btif_sock_l2cap
Eliminate socket verbosity print_events()
Re-log stack/acl::BTM_SwitchRole
Reduce identical APIs
Remove #def code conditional BTM_MAX_SCO_LINKS
Remove unused #defs stack/btm/btm_ble_int_types::
Internally link stack/btm/btm_ble_gap::btm_send_hci_scan_enable
Use new APIS stack/acl/btm_acl
Streamline stack/acl/btm_acl::btm_acl_created
Add new APIS stack/acl/btm_acl
Myles Watson [Wed, 23 Sep 2020 13:24:55 +0000 (06:24 -0700)]
RootCanal: Set event masks
Test: cert/run --host
Bug:
145832107
Tag: #gd-refactor
Change-Id: Ie8b63828c2d774852682c0ff6888150d9ee524fc
Hansong Zhang [Wed, 23 Sep 2020 22:33:27 +0000 (22:33 +0000)]
SDP code clean up am:
9b7b90aabf am:
027614ac01
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435157
Change-Id: I96fa4073b020c3625fe9a7a764f633d331bf0a1f
Hansong Zhang [Wed, 23 Sep 2020 22:33:25 +0000 (22:33 +0000)]
pL2CA_DisconnectCfm_Cb is unused am:
b803f44d90 am:
6480ed0415
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435156
Change-Id: I62cb8f42f672f8c61a5424d59eb7eb70949e549b
Hansong Zhang [Wed, 23 Sep 2020 22:33:23 +0000 (22:33 +0000)]
HIDH: Move L2cap disconnect logic together am:
ba20fb9716 am:
b669795777
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435155
Change-Id: Ic05639b6645d79bc9627a1145eaf273a600bd11b
Hansong Zhang [Wed, 23 Sep 2020 22:33:21 +0000 (22:33 +0000)]
HIDD: Move L2cap disconnect logic together am:
b69ff0c16c am:
25f2ef478d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435154
Change-Id: I3e431c9b5db8da2235bb41d427f6adeba402773c
Hansong Zhang [Wed, 23 Sep 2020 22:33:19 +0000 (22:33 +0000)]
AVCT: Move L2cap disconnect logic together am:
99a0ebf3ec am:
2d2db9925d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435153
Change-Id: I45dd969a41631b68d8d100026f8b02bba0835404
Hansong Zhang [Wed, 23 Sep 2020 22:33:17 +0000 (22:33 +0000)]
AVCT_BR: Move L2cap disconnect logic together am:
08c437d37c am:
13363d059e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435152
Change-Id: Icb2d60c760780856cb661a4eb283cd87f2dc9e21
Hansong Zhang [Wed, 23 Sep 2020 22:33:15 +0000 (22:33 +0000)]
AVDT: Move L2cap disconnect logic together am:
75b25c50b6 am:
cfb683ff01
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435007
Change-Id: Ib571b61cf7eda3bb36ff6f7dcc70347b7e094c66
Hansong Zhang [Wed, 23 Sep 2020 22:33:11 +0000 (22:33 +0000)]
Remove unused parameter in avdt_ad_tc_close_ind am:
1510436dd6 am:
48f5fffbf0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435006
Change-Id: I28eb9b7d9e2e14426874247842f2f00b865c93b1
Hansong Zhang [Wed, 23 Sep 2020 22:15:19 +0000 (22:15 +0000)]
SDP code clean up am:
9b7b90aabf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435157
Change-Id: I716d48bb1af4c6a4bcf6db956835bd6fdb033dde
Hansong Zhang [Wed, 23 Sep 2020 22:15:15 +0000 (22:15 +0000)]
pL2CA_DisconnectCfm_Cb is unused am:
b803f44d90
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435156
Change-Id: Icf4ca83d506b8c498243ee962036444260f5effe
Hansong Zhang [Wed, 23 Sep 2020 22:15:12 +0000 (22:15 +0000)]
HIDH: Move L2cap disconnect logic together am:
ba20fb9716
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435155
Change-Id: I19041c12c30466257f31df006c33cec3eb28ff36
Hansong Zhang [Wed, 23 Sep 2020 22:15:09 +0000 (22:15 +0000)]
HIDD: Move L2cap disconnect logic together am:
b69ff0c16c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435154
Change-Id: I6336f26c05421d5f65c2ab1f3e457832acb23d0f
Hansong Zhang [Wed, 23 Sep 2020 22:15:05 +0000 (22:15 +0000)]
AVCT: Move L2cap disconnect logic together am:
99a0ebf3ec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435153
Change-Id: Iceb598d61504b4a3f56610a4778b3c7b671b5d5f
Hansong Zhang [Wed, 23 Sep 2020 22:15:02 +0000 (22:15 +0000)]
AVCT_BR: Move L2cap disconnect logic together am:
08c437d37c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435152
Change-Id: I42815fa56bf56ed8ac73e8a75361124482143c94
Hansong Zhang [Wed, 23 Sep 2020 22:14:58 +0000 (22:14 +0000)]
AVDT: Move L2cap disconnect logic together am:
75b25c50b6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435007
Change-Id: I4f4c7d6fa6c667710df429c31dd256af9a78efa2
Hansong Zhang [Wed, 23 Sep 2020 22:14:07 +0000 (22:14 +0000)]
Remove unused parameter in avdt_ad_tc_close_ind am:
1510436dd6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435006
Change-Id: I8d53b55def1c9757c2f9185f1b85a6f1ce600f17
Hansong Zhang [Wed, 23 Sep 2020 05:59:42 +0000 (22:59 -0700)]
SDP code clean up
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0311cc26bf5bf3b6d038dcceb42ede082915c674
Hansong Zhang [Wed, 23 Sep 2020 05:54:01 +0000 (22:54 -0700)]
pL2CA_DisconnectCfm_Cb is unused
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iedfafad7ca0546340230abc18dd2396ef5863fba
Hansong Zhang [Wed, 23 Sep 2020 05:47:15 +0000 (22:47 -0700)]
HIDH: Move L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I734ed32d6daa691fe5a56cb912417fb2b280c7ec
Hansong Zhang [Wed, 23 Sep 2020 05:45:27 +0000 (22:45 -0700)]
HIDD: Move L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ibd180908b31afa018488e3454fa7f88240fb78ab
Hansong Zhang [Wed, 23 Sep 2020 05:32:27 +0000 (22:32 -0700)]
AVCT: Move L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Idfb4d668e49d18b993adbdd622edbcc147badfa5
Hansong Zhang [Wed, 23 Sep 2020 05:29:06 +0000 (22:29 -0700)]
AVCT_BR: Move L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7a5a9e29936fd3022c7b718d48c67b8ea74523f4
Hansong Zhang [Wed, 23 Sep 2020 05:07:03 +0000 (22:07 -0700)]
AVDT: Move L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ice0c606bbaf3467cbbf7cedd266765874d760e66
Hansong Zhang [Wed, 23 Sep 2020 04:58:21 +0000 (21:58 -0700)]
Remove unused parameter in avdt_ad_tc_close_ind
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I888bb41bc28378406d441856ac1e615eb8c970a2
Treehugger Robot [Wed, 23 Sep 2020 21:40:34 +0000 (21:40 +0000)]
Merge "NameDB: Actually remove the address from requested addresses" am:
be6fa9814b am:
39bc6765a3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1433067
Change-Id: Ia31d75a665ac548b5b462b601c67846b17013230
Chris Manton [Sat, 19 Sep 2020 01:15:36 +0000 (18:15 -0700)]
Re-log bta/gatt::bta_gattc_conn_cback
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I5fad51611fb62c197f2860c98470cf32e7afab8d