OSDN Git Service
Hansong Zhang [Fri, 25 Sep 2020 06:03:07 +0000 (06:03 +0000)]
AVRC uses the same mtu am:
0ae5bb34fd am:
c4d63071f4 am:
7b4399dc2a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437713
Change-Id: Ifc7bf64be0fbfdaa05c1a1ad2b689673726431df
Hansong Zhang [Fri, 25 Sep 2020 06:02:28 +0000 (06:02 +0000)]
We can't bypass FCS am:
9bc2e8608f am:
6f4ca5bf59 am:
687d2ed27b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437473
Change-Id: I76e6c60df87dd6d00720642f80abd4ce24628228
Hansong Zhang [Fri, 25 Sep 2020 06:02:26 +0000 (06:02 +0000)]
p_ccb->bypass_fcs is never satisfied am:
772cf45701 am:
2ed2cc8114 am:
70fc35ff8a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437472
Change-Id: I40acaf73798b9645d903bbf73cfb1a3c05723f17
Hansong Zhang [Fri, 25 Sep 2020 06:02:24 +0000 (06:02 +0000)]
L2CAP: We never explicitly disable FCS am:
be38658455 am:
5a705e6187 am:
a39ddd0cdb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437471
Change-Id: I48cfecec5fd18ca7183e13b8b39d959e4458a880
Treehugger Robot [Fri, 25 Sep 2020 06:01:41 +0000 (06:01 +0000)]
Merge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c am:
cd9e8dc741 am:
be7615441f am:
953e1b6757
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1437478
Change-Id: I79ce21136ce666a79991b99b1bfd71c99f000d7b
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: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
Myles Watson [Fri, 25 Sep 2020 05:25:45 +0000 (05:25 +0000)]
DirectHciTest: Accept more events am:
aed10eff6e am:
edbcee412a am:
e0af345ea4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436373
Change-Id: I71773d2663dcb4997b91424e27f6acff6893b57b
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:56:16 +0000 (07:56 +0000)]
BNEP: Always use BNEP_MTU_SIZE as remote MTU size am:
6d23e9f28b am:
b07dd570d1 am:
4a22281a5d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436435
Change-Id: Icca05daf147002f760a81e2767cbf5cc96207bdb
Hansong Zhang [Thu, 24 Sep 2020 07:56:14 +0000 (07:56 +0000)]
BNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE am:
4f72bc0ff3 am:
e5dd31c4e8 am:
1b9cb66d5e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436434
Change-Id: I3be42ca41b19e141b583aa2b91b45ac92320af79
Hansong Zhang [Thu, 24 Sep 2020 07:56:04 +0000 (07:56 +0000)]
SDP: FCR mode is checked in L2cap layer am:
d581fc8a55 am:
bda42151bb am:
b622ad6096
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435847
Change-Id: I2490750464092dc1cdd01ad59879f30d291d6890
Hansong Zhang [Thu, 24 Sep 2020 07:56:03 +0000 (07:56 +0000)]
Remove already handled case am:
5a3ea66dff am:
6261a08c7b am:
067373998b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435846
Change-Id: Ib85772c1ad8f12371b11f116449f8c1b42813a08
Hansong Zhang [Thu, 24 Sep 2020 07:56:01 +0000 (07:56 +0000)]
L2CAP: Allowed mode is equivalent to preferred mode am:
dea3f23a21 am:
f82841c407 am:
44d141cadb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435845
Change-Id: I62f0fd0aacdf20ff67ef73274d4267575df77e10
Hansong Zhang [Thu, 24 Sep 2020 07:55:38 +0000 (07:55 +0000)]
Remove L2CAP_FCR_STREAM_MODE related function am:
0784dff159 am:
840076d554 am:
aa1f69a2ab
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435844
Change-Id: I9e96616ab5914c4cd4252d62b135de7d522ea9f1
Hansong Zhang [Thu, 24 Sep 2020 07:55:35 +0000 (07:55 +0000)]
L2CAP_FCR_STREAM_MODE is never used am:
186c7d13c8 am:
8f4fed02f0 am:
18f42d2dc9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435843
Change-Id: I1277f4396fa3cd1348953a6fe469ede668de1f06
Hansong Zhang [Thu, 24 Sep 2020 07:55:33 +0000 (07:55 +0000)]
AVCT_BR always uses L2CAP_FCR_ERTM_MODE am:
b744aeeb13 am:
e18bf0b7d3 am:
1e4bbf489a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435842
Change-Id: I1f78b5fa902a394db9cdbaf82f4051710784040c
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 04:03:44 +0000 (04:03 +0000)]
L2cap: Store MTU and ERTM info during registration am:
11d4544b0a am:
ef37c2c9f6 am:
7cd3aa3d41
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435841
Change-Id: I6c64b7960a40e2baaf50eda366a3cc9cf932a593
Hansong Zhang [Thu, 24 Sep 2020 04:03:42 +0000 (04:03 +0000)]
SDP_FLUSH_TO is always 0xFFFF (L2cap default) am:
88a4aac0cc am:
19164f1809 am:
197c207d2f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435840
Change-Id: Iced30cbabbe1426f3318d8d50dcd68a156b4e62d
Hansong Zhang [Thu, 24 Sep 2020 04:03:39 +0000 (04:03 +0000)]
SDP: We always use basic mode am:
738ceb5df3 am:
d733b3ada8 am:
bf994764c8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435839
Change-Id: I401a6fdf410c3b6213f81c779cc98d51a392228c
Hansong Zhang [Thu, 24 Sep 2020 04:03:37 +0000 (04:03 +0000)]
RFCOMM code minor clean up am:
4d9eeb522b am:
09bbc3fa56 am:
b29843f36d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435838
Change-Id: Ibd970d73219f6ffc45d37c0161bdd515c2f4a647
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 01:17:51 +0000 (01:17 +0000)]
Merge "RootCanal: Set event masks" am:
aef2d91113 am:
67bf2e33b7 am:
e0a02e9e75
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436372
Change-Id: I76bc36c3b5489a4a7623961f0fa90813f0d28caa
Treehugger Robot [Thu, 24 Sep 2020 01:17:44 +0000 (01:17 +0000)]
Merge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ... am:
ff1b628212 am:
ff98a4915a am:
b71eca635e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435762
Change-Id: If8065e512280a2d81c095359b7aa8d0395e2a893
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
Hansong Zhang [Wed, 23 Sep 2020 23:21:03 +0000 (23:21 +0000)]
SDP code clean up am:
9b7b90aabf am:
027614ac01 am:
7e7717ee11
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435157
Change-Id: I11f3aaa6318cdee920c4a6c3df1b5ed1c83d65f0
Hansong Zhang [Wed, 23 Sep 2020 23:21:01 +0000 (23:21 +0000)]
pL2CA_DisconnectCfm_Cb is unused am:
b803f44d90 am:
6480ed0415 am:
72a2bbf28c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435156
Change-Id: I7d7ab2cc9bac231721e41c578cc23aacc4dcb037
Hansong Zhang [Wed, 23 Sep 2020 23:20:59 +0000 (23:20 +0000)]
HIDH: Move L2cap disconnect logic together am:
ba20fb9716 am:
b669795777 am:
bc52017a35
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435155
Change-Id: Icb7bfe5f291ec4f12eae1ceca590cb27eac3a4aa
Hansong Zhang [Wed, 23 Sep 2020 23:20:57 +0000 (23:20 +0000)]
HIDD: Move L2cap disconnect logic together am:
b69ff0c16c am:
25f2ef478d am:
df8f7d26f0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435154
Change-Id: I87be2a4e78e9fe421988f5773b77f9f958aa454a
Hansong Zhang [Wed, 23 Sep 2020 23:20:56 +0000 (23:20 +0000)]
AVCT: Move L2cap disconnect logic together am:
99a0ebf3ec am:
2d2db9925d am:
37c708f83d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435153
Change-Id: Idc3d3510a631e356a7e1585a4b38280d8e1a00e1
Hansong Zhang [Wed, 23 Sep 2020 23:20:54 +0000 (23:20 +0000)]
AVCT_BR: Move L2cap disconnect logic together am:
08c437d37c am:
13363d059e am:
26d6d966ad
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435152
Change-Id: Ia0b24517fd23ebf365072a9fc800baaa3332f85f
Hansong Zhang [Wed, 23 Sep 2020 23:20:52 +0000 (23:20 +0000)]
AVDT: Move L2cap disconnect logic together am:
75b25c50b6 am:
cfb683ff01 am:
6a0749f10c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435007
Change-Id: I6707da81837658f469fc8e022b2d04bddc10fdca
Hansong Zhang [Wed, 23 Sep 2020 23:20:50 +0000 (23:20 +0000)]
Remove unused parameter in avdt_ad_tc_close_ind am:
1510436dd6 am:
48f5fffbf0 am:
a99eb1bcb6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435006
Change-Id: I1f7a62aeb947cd4f56008eaf28fee29e97ca3372
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