OSDN Git Service

android-x86/system-bt.git
3 years agoMerge "Expose service changed event to application (1/3)" am: b87849b7b1 am: cf3be722...
HsingYuan Lo [Fri, 25 Sep 2020 06:05:12 +0000 (06:05 +0000)]
Merge "Expose service changed event to application (1/3)" am: b87849b7b1 am: cf3be7220d am: e4a26cfa6a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1433963

Change-Id: I615cfef0f1712142d3efc733a25b7ddcf53cdbc2

3 years agoAVDTP: Use the same MTU in config request am: 1780e37a0b am: 4f611c2569 am: 53e31bfd7a
Hansong Zhang [Fri, 25 Sep 2020 06:03:44 +0000 (06:03 +0000)]
AVDTP: Use the same MTU in config request am: 1780e37a0b am: 4f611c2569 am: 53e31bfd7a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437938

Change-Id: I56a380f96ddd6295da4cadbcaa78a2cdf22fac87

3 years agoRemove unused definition in benp_int am: cac61e8f34 am: debd13b9e0 am: 20ae7b2a0d
Hansong Zhang [Fri, 25 Sep 2020 06:03:42 +0000 (06:03 +0000)]
Remove unused definition in benp_int am: cac61e8f34 am: debd13b9e0 am: 20ae7b2a0d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437937

Change-Id: Ib4452bd7cee007d5fc89d5161cb93010020623f5

3 years agoWe always send default flush timeout am: 31903b6da7 am: 352f84bb96 am: d7f3f785b4
Hansong Zhang [Fri, 25 Sep 2020 06:03:32 +0000 (06:03 +0000)]
We always send default flush timeout am: 31903b6da7 am: 352f84bb96 am: d7f3f785b4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437935

Change-Id: I3e239643a16d242aa66688ace115f44738d9b237

3 years agoAVDT Flush Timeout is fixed am: 655234d56e am: 3a1caba6b7 am: 8b15290af8
Hansong Zhang [Fri, 25 Sep 2020 06:03:30 +0000 (06:03 +0000)]
AVDT Flush Timeout is fixed am: 655234d56e am: 3a1caba6b7 am: 8b15290af8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437934

Change-Id: I9b825697e0f8c0ed2a2f5ac3bc20a738ea584112

3 years agoAVDT MTU is fixed am: 94722f9372 am: 9b6deb86e6 am: a9ee8d533c
Hansong Zhang [Fri, 25 Sep 2020 06:03:28 +0000 (06:03 +0000)]
AVDT MTU is fixed am: 94722f9372 am: 9b6deb86e6 am: a9ee8d533c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1438053

Change-Id: Ife86d21d727443375a7975a7aa23506087d316e9

3 years agoAVRC_BR uses the same mtu am: 810f878b5a am: 5e76768733 am: 3d6e1b5fab
Hansong Zhang [Fri, 25 Sep 2020 06:03:16 +0000 (06:03 +0000)]
AVRC_BR uses the same mtu am: 810f878b5a am: 5e76768733 am: 3d6e1b5fab

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1438052

Change-Id: I893f6132caf1f89fa1150cc5cef30db7ca577bcf

3 years agoAVRC uses the same mtu (part 2) am: 6e25c080da am: 77baf15141 am: 5c269fb06e
Hansong Zhang [Fri, 25 Sep 2020 06:03:10 +0000 (06:03 +0000)]
AVRC uses the same mtu (part 2) am: 6e25c080da am: 77baf15141 am: 5c269fb06e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437714

Change-Id: I0a57dd6eeaa659bca6df3a61c488e1dec8fe3c68

3 years agoAVRC uses the same mtu am: 0ae5bb34fd am: c4d63071f4 am: 7b4399dc2a
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

3 years agoWe can't bypass FCS am: 9bc2e8608f am: 6f4ca5bf59 am: 687d2ed27b
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

3 years agop_ccb->bypass_fcs is never satisfied am: 772cf45701 am: 2ed2cc8114 am: 70fc35ff8a
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

3 years agoL2CAP: We never explicitly disable FCS am: be38658455 am: 5a705e6187 am: a39ddd0cdb
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

3 years agoMerge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c am: cd9e8dc741 am: be7615441f...
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

3 years agoMerge "Expose service changed event to application (1/3)" am: b87849b7b1 am: cf3be7220d
HsingYuan Lo [Fri, 25 Sep 2020 06:01:11 +0000 (06:01 +0000)]
Merge "Expose service changed event to application (1/3)" am: b87849b7b1 am: cf3be7220d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1433963

Change-Id: I65e3fac22e76fd2263acbaaa52b5be7a62b61a9a

3 years agoMerge "Expose service changed event to application (1/3)" am: b87849b7b1
HsingYuan Lo [Fri, 25 Sep 2020 05:51:49 +0000 (05:51 +0000)]
Merge "Expose service changed event to application (1/3)" am: b87849b7b1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1433963

Change-Id: If50a9798d140cccaa54f29009cea94afeb991a95

3 years agoAVDTP: Use the same MTU in config request am: 1780e37a0b am: 4f611c2569
Hansong Zhang [Fri, 25 Sep 2020 05:47:25 +0000 (05:47 +0000)]
AVDTP: Use the same MTU in config request am: 1780e37a0b am: 4f611c2569

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437938

Change-Id: Ia699cc19a4c756a00b1ec73a9ceaf561b9fa31cd

3 years agoRemove unused definition in benp_int am: cac61e8f34 am: debd13b9e0
Hansong Zhang [Fri, 25 Sep 2020 05:47:24 +0000 (05:47 +0000)]
Remove unused definition in benp_int am: cac61e8f34 am: debd13b9e0

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437937

Change-Id: If6086f58be6a6bc22a0e6370586dda382caf5a83

3 years agoWe always send default flush timeout am: 31903b6da7 am: 352f84bb96
Hansong Zhang [Fri, 25 Sep 2020 05:47:18 +0000 (05:47 +0000)]
We always send default flush timeout am: 31903b6da7 am: 352f84bb96

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437935

Change-Id: I81657696d4bfab394c91c1c922472622c2c326d3

3 years agoAVDT Flush Timeout is fixed am: 655234d56e am: 3a1caba6b7
Hansong Zhang [Fri, 25 Sep 2020 05:47:16 +0000 (05:47 +0000)]
AVDT Flush Timeout is fixed am: 655234d56e am: 3a1caba6b7

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437934

Change-Id: Iddf79c9341bb093c4a4eb845d48447a78f373cce

3 years agoAVDT MTU is fixed am: 94722f9372 am: 9b6deb86e6
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

3 years agoAVRC_BR uses the same mtu am: 810f878b5a am: 5e76768733
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

3 years agoAVRC uses the same mtu (part 2) am: 6e25c080da am: 77baf15141
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

3 years agoAVRC uses the same mtu am: 0ae5bb34fd am: c4d63071f4
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

3 years agoWe can't bypass FCS am: 9bc2e8608f am: 6f4ca5bf59
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

3 years agop_ccb->bypass_fcs is never satisfied am: 772cf45701 am: 2ed2cc8114
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

3 years agoL2CAP: We never explicitly disable FCS am: be38658455 am: 5a705e6187
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

3 years agoMerge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c am: cd9e8dc741 am: be7615441f
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

3 years agoAVDTP: Use the same MTU in config request am: 1780e37a0b
Hansong Zhang [Fri, 25 Sep 2020 05:45:02 +0000 (05:45 +0000)]
AVDTP: Use the same MTU in config request am: 1780e37a0b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437938

Change-Id: I5e3014b2451932a8fde734b13ad840171437835b

3 years agoRemove unused definition in benp_int am: cac61e8f34
Hansong Zhang [Fri, 25 Sep 2020 05:44:58 +0000 (05:44 +0000)]
Remove unused definition in benp_int am: cac61e8f34

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437937

Change-Id: Ibd1f295a4b10b602044bd4708c8cf74527a81294

3 years agoWe always send default flush timeout am: 31903b6da7
Hansong Zhang [Fri, 25 Sep 2020 05:44:48 +0000 (05:44 +0000)]
We always send default flush timeout am: 31903b6da7

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437935

Change-Id: I66644495f589ca8a4a6a9db849018ce21b58102f

3 years agoAVDT Flush Timeout is fixed am: 655234d56e
Hansong Zhang [Fri, 25 Sep 2020 05:44:45 +0000 (05:44 +0000)]
AVDT Flush Timeout is fixed am: 655234d56e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437934

Change-Id: Ia4026c0439007a1dd54bcf26bbc5814446b5adae

3 years agoAVDT MTU is fixed am: 94722f9372
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

3 years agoAVRC_BR uses the same mtu am: 810f878b5a
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

3 years agoAVRC uses the same mtu (part 2) am: 6e25c080da
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

3 years agoAVRC uses the same mtu am: 0ae5bb34fd
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

3 years agoWe can't bypass FCS am: 9bc2e8608f
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

3 years agop_ccb->bypass_fcs is never satisfied am: 772cf45701
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

3 years agoL2CAP: We never explicitly disable FCS am: be38658455
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

3 years agoMerge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c am: cd9e8dc741
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

3 years agoDirectHciTest: Accept more events am: aed10eff6e am: edbcee412a am: e0af345ea4
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

3 years agoMerge "Expose service changed event to application (1/3)"
HsingYuan Lo [Fri, 25 Sep 2020 04:04:19 +0000 (04:04 +0000)]
Merge "Expose service changed event to application (1/3)"

3 years agoAVDTP: Use the same MTU in config request
Hansong Zhang [Thu, 24 Sep 2020 23:45:19 +0000 (16:45 -0700)]
AVDTP: Use the same MTU in config request

MTU in config request indicates how many bytes _we_ can process at most.
Instead of using different number for signalling and audio channel, we
use the same number, which is the greater one . This won't require the
remote side to have a larger buffer size, as they can still send the
same packet size as before. We won't need to worry about memory
implication either, because audio buffer will go away quickly.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iab025784699a77d89d784926d1f393a3cc2fe767

3 years agoRemove unused definition in benp_int
Hansong Zhang [Thu, 24 Sep 2020 23:19:19 +0000 (16:19 -0700)]
Remove unused definition in benp_int

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id2ba9e6366a2561249ee844b45a118d219d96b16

3 years agoWe always send default flush timeout
Hansong Zhang [Thu, 24 Sep 2020 23:16:33 +0000 (16:16 -0700)]
We always send default flush timeout

When we send out config request, we always use flush timeout 0xffff
(infinity), which is the default value.

We don't need to include this value in config request.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic06f1e7e39ccbce2ec85c6126d30e179d5971837

3 years agoAVDT Flush Timeout is fixed
Hansong Zhang [Thu, 24 Sep 2020 22:50:07 +0000 (15:50 -0700)]
AVDT Flush Timeout is fixed

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6f85b8bda7dc92310a7c474fa016c5f507cb4e96

3 years agoAVDT MTU is fixed
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

3 years agoAVRC_BR uses the same mtu
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

3 years agoAVRC uses the same mtu (part 2)
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

3 years agoAVRC uses the same mtu
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

3 years agoWe can't bypass FCS
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

3 years agop_ccb->bypass_fcs is never satisfied
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

3 years agoL2CAP: We never explicitly disable FCS
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

3 years agoMerge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c
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

3 years agoDirectHciTest: Accept more events am: aed10eff6e am: edbcee412a
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

3 years agoDirectHciTest: Accept more events am: aed10eff6e
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

3 years agoAdd stack/include/avdt_api::peer_stream_endpoint_text
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

3 years agoRe-log btif/src/btif_sock_l2cap
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

3 years agoAdd Api for tACL_CB::tACL_CONN::transport
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

3 years agoComplete hci errorcode text
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

3 years agoDirectHciTest: Accept more events
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

3 years agoBNEP: Always use BNEP_MTU_SIZE as remote MTU size am: 6d23e9f28b am: b07dd570d1 am...
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

3 years agoBNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE am: 4f72bc0ff3 am: e5dd31c4e8 am:...
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

3 years agoSDP: FCR mode is checked in L2cap layer am: d581fc8a55 am: bda42151bb am: b622ad6096
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

3 years agoRemove already handled case am: 5a3ea66dff am: 6261a08c7b am: 067373998b
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

3 years agoL2CAP: Allowed mode is equivalent to preferred mode am: dea3f23a21 am: f82841c407...
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

3 years agoRemove L2CAP_FCR_STREAM_MODE related function am: 0784dff159 am: 840076d554 am: aa1f6...
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

3 years agoL2CAP_FCR_STREAM_MODE is never used am: 186c7d13c8 am: 8f4fed02f0 am: 18f42d2dc9
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

3 years agoAVCT_BR always uses L2CAP_FCR_ERTM_MODE am: b744aeeb13 am: e18bf0b7d3 am: 1e4bbf489a
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

3 years agoBNEP: Always use BNEP_MTU_SIZE as remote MTU size am: 6d23e9f28b am: b07dd570d1
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

3 years agoBNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE am: 4f72bc0ff3 am: e5dd31c4e8
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

3 years agoSDP: FCR mode is checked in L2cap layer am: d581fc8a55 am: bda42151bb
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

3 years agoRemove already handled case am: 5a3ea66dff am: 6261a08c7b
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

3 years agoL2CAP: Allowed mode is equivalent to preferred mode am: dea3f23a21 am: f82841c407
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

3 years agoRemove L2CAP_FCR_STREAM_MODE related function am: 0784dff159 am: 840076d554
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

3 years agoL2CAP_FCR_STREAM_MODE is never used am: 186c7d13c8 am: 8f4fed02f0
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

3 years agoAVCT_BR always uses L2CAP_FCR_ERTM_MODE am: b744aeeb13 am: e18bf0b7d3
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

3 years agoBNEP: Always use BNEP_MTU_SIZE as remote MTU size am: 6d23e9f28b
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

3 years agoBNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE am: 4f72bc0ff3
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

3 years agoSDP: FCR mode is checked in L2cap layer am: d581fc8a55
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

3 years agoRemove already handled case am: 5a3ea66dff
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

3 years agoL2CAP: Allowed mode is equivalent to preferred mode am: dea3f23a21
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

3 years agoRemove L2CAP_FCR_STREAM_MODE related function am: 0784dff159
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

3 years agoL2CAP_FCR_STREAM_MODE is never used am: 186c7d13c8
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

3 years agoAVCT_BR always uses L2CAP_FCR_ERTM_MODE am: b744aeeb13
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

3 years agoL2cap: Store MTU and ERTM info during registration am: 11d4544b0a am: ef37c2c9f6...
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

3 years agoSDP_FLUSH_TO is always 0xFFFF (L2cap default) am: 88a4aac0cc am: 19164f1809 am: 197c2...
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

3 years agoSDP: We always use basic mode am: 738ceb5df3 am: d733b3ada8 am: bf994764c8
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

3 years agoRFCOMM code minor clean up am: 4d9eeb522b am: 09bbc3fa56 am: b29843f36d
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

3 years agoL2cap: Store MTU and ERTM info during registration am: 11d4544b0a am: ef37c2c9f6
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

3 years agoSDP_FLUSH_TO is always 0xFFFF (L2cap default) am: 88a4aac0cc am: 19164f1809
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

3 years agoSDP: We always use basic mode am: 738ceb5df3 am: d733b3ada8
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

3 years agoRFCOMM code minor clean up am: 4d9eeb522b am: 09bbc3fa56
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

3 years agoL2cap: Store MTU and ERTM info during registration am: 11d4544b0a
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

3 years agoSDP_FLUSH_TO is always 0xFFFF (L2cap default) am: 88a4aac0cc
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

3 years agoSDP: We always use basic mode am: 738ceb5df3
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

3 years agoRFCOMM code minor clean up am: 4d9eeb522b
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

3 years agoBNEP: Always use BNEP_MTU_SIZE as remote MTU size
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

3 years agoBNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE
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

3 years agoSDP: FCR mode is checked in L2cap layer
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

3 years agoRemove already handled case
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