OSDN Git Service
Hansong Zhang [Sun, 27 Sep 2020 07:50:19 +0000 (07:50 +0000)]
Use hidh_on_l2cap_error for error handling am:
95149a585c am:
2170acaf97
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439959
Change-Id: Ifc98b7f512de9b454ec8b6ab6e920ae79e8ec693
Hansong Zhang [Sun, 27 Sep 2020 07:50:17 +0000 (07:50 +0000)]
Use hidd_on_l2cap_error for error handling am:
407ad73659 am:
39bb8732ce
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439638
Change-Id: Iffa5f30c581db924287123cfb6d477e87a2e32e0
Hansong Zhang [Sun, 27 Sep 2020 07:50:15 +0000 (07:50 +0000)]
HID: Simplify security check code am:
a412f6bbb3 am:
0959d40562
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439965
Change-Id: I912bf5b992b7e4e87104f951984ac3c744362836
Hansong Zhang [Sun, 27 Sep 2020 07:50:13 +0000 (07:50 +0000)]
Use rfc_on_l2cap_error for error handling am:
d3c390b077 am:
ab41398cec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439637
Change-Id: Icf147ed35c5fd9a552655fe90bce777fa5df9b05
Hansong Zhang [Sun, 27 Sep 2020 07:50:11 +0000 (07:50 +0000)]
Use avct_on_l2cap_error for error handling am:
4e82f0d26c am:
45353d3326
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439964
Change-Id: I305f7dec303a1ea359ebea455c93241496307eab
Hansong Zhang [Sun, 27 Sep 2020 07:50:08 +0000 (07:50 +0000)]
Use avdt_on_l2cap_error for error handling am:
ece51101ed am:
c06e9e0a8d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439963
Change-Id: Ic9ad867a8b13b12db4269d8a9a2f0e7e4bac844a
Hansong Zhang [Sun, 27 Sep 2020 07:50:05 +0000 (07:50 +0000)]
Use avct_br_on_l2cap_error am:
4e00fa771a am:
df5d0dee30
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439962
Change-Id: I698d4293782587ccb4a01429ebc1da08a28c47c5
Hansong Zhang [Sun, 27 Sep 2020 07:25:37 +0000 (07:25 +0000)]
Use hidh_on_l2cap_error for error handling am:
95149a585c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439959
Change-Id: I306d906901998af5c5cf41b844e32b16df7a7722
Hansong Zhang [Sun, 27 Sep 2020 07:25:34 +0000 (07:25 +0000)]
Use hidd_on_l2cap_error for error handling am:
407ad73659
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439638
Change-Id: Ice0383502cc4ed8210dd326671a17fbecbf5e154
Hansong Zhang [Sun, 27 Sep 2020 07:25:31 +0000 (07:25 +0000)]
HID: Simplify security check code am:
a412f6bbb3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439965
Change-Id: I6f128e6bd65565bf44ad6e1257c92fb26c692258
Hansong Zhang [Sun, 27 Sep 2020 07:25:28 +0000 (07:25 +0000)]
Use rfc_on_l2cap_error for error handling am:
d3c390b077
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439637
Change-Id: I70c2c8bf6286149d4a09cce25d67fe4a1a311c61
Hansong Zhang [Sun, 27 Sep 2020 07:25:25 +0000 (07:25 +0000)]
Use avct_on_l2cap_error for error handling am:
4e82f0d26c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439964
Change-Id: Id17abbde51854c5b624f6a7527244e4aa11eff01
Hansong Zhang [Sun, 27 Sep 2020 07:25:21 +0000 (07:25 +0000)]
Use avdt_on_l2cap_error for error handling am:
ece51101ed
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439963
Change-Id: I26b046a88658c748960d09e4f3499ad09ae48a37
Hansong Zhang [Sun, 27 Sep 2020 07:24:40 +0000 (07:24 +0000)]
Use avct_br_on_l2cap_error am:
4e00fa771a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439962
Change-Id: Ib7c8310fc78799f021ca72a51576ea13cda577f2
Hansong Zhang [Sat, 26 Sep 2020 06:06:13 +0000 (23:06 -0700)]
Use hidh_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I098743c83c82445618d02c2d8491890d8f765fee
Hansong Zhang [Sat, 26 Sep 2020 06:18:33 +0000 (23:18 -0700)]
Use hidd_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I96bb727b01b8f0114d9f0cba1b8068e9591fae1f
Hansong Zhang [Sat, 26 Sep 2020 06:04:26 +0000 (23:04 -0700)]
HID: Simplify security check code
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ief3f87adbe41c1d4c5ea848fcddc3d1a3352166b
Hansong Zhang [Sat, 26 Sep 2020 06:30:27 +0000 (23:30 -0700)]
Use rfc_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I32a6be12ab14a27c9c0502961bf5bd9bdbdff005
Hansong Zhang [Sat, 26 Sep 2020 00:40:04 +0000 (17:40 -0700)]
Use avct_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6e35a51a175b43d9b0dc5bb5be859e2d5ff94fa1
Hansong Zhang [Sat, 26 Sep 2020 00:35:36 +0000 (17:35 -0700)]
Use avdt_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I03f15d69e86d12b53fa4ee7fc711d4dca8a294aa
Hansong Zhang [Sat, 26 Sep 2020 00:12:47 +0000 (17:12 -0700)]
Use avct_br_on_l2cap_error
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I40fb1d61ff9375d0da2e1f4c83d42d5b273699c4
Hansong Zhang [Sun, 27 Sep 2020 00:45:17 +0000 (00:45 +0000)]
Use gap_on_l2cap_error for error handling am:
09f5d7f465 am:
7e70de9892
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439960
Change-Id: If8823ce7c8425b0eae2b286e816f4924a8943d0d
Hansong Zhang [Sun, 27 Sep 2020 00:30:14 +0000 (00:30 +0000)]
Use gap_on_l2cap_error for error handling am:
09f5d7f465
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439960
Change-Id: Ib5e1789effa96f6aafc4398099c917629c4baafe
Hansong Zhang [Sat, 26 Sep 2020 23:13:01 +0000 (23:13 +0000)]
Use gatt_on_l2cap_error for error handling am:
e8dc945f4d am:
1ff9532d2b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439958
Change-Id: I170ddb81f2220ef1ccc2dc0eb2f7b7da9abd5773
Hansong Zhang [Sat, 26 Sep 2020 23:12:58 +0000 (23:12 +0000)]
Simplify bnep_on_l2cap_error am:
3b18048449 am:
4ec67658f4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439957
Change-Id: Ide68451b3fbb948d53ba58512c4b0def75652490
Hansong Zhang [Sat, 26 Sep 2020 23:12:56 +0000 (23:12 +0000)]
Use bnep_on_l2cap_error for error handling am:
44b477a8bc am:
cb2dd251df
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439956
Change-Id: If1b91a9fd15b4e1cc7fda5fdcfce16f6ced0eea3
Hansong Zhang [Sat, 26 Sep 2020 23:12:55 +0000 (23:12 +0000)]
Simplify sdp_on_l2cap_error am:
c86dcd3704 am:
fc9c30fb8f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439955
Change-Id: I72e2f24594f21f87c21f7526a0408239c4b91366
Hansong Zhang [Sat, 26 Sep 2020 23:12:53 +0000 (23:12 +0000)]
SDP failure reason isn't used am:
bd04c8dcd3 am:
2a521b89ae
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439954
Change-Id: Ia4654f15a0d23a86efddaacba04d99568f01bc2e
Hansong Zhang [Sat, 26 Sep 2020 23:12:51 +0000 (23:12 +0000)]
SDP: Move L2cap error handling to one place am:
ceac9ce032 am:
81acebad6f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439953
Change-Id: I8b28894954480fa4d19d6659fe0b9dd059f15b83
Hansong Zhang [Sat, 26 Sep 2020 23:12:49 +0000 (23:12 +0000)]
Remove unused code in l2c_api am:
3fd840f421 am:
beea7302e3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439952
Change-Id: I7ff99c20c82950b6fe96712bfbe0c3f6dbd3bd54
Hansong Zhang [Sat, 26 Sep 2020 23:12:45 +0000 (23:12 +0000)]
Remove L2CA_ErtmConnectRsp am:
11e328e0d4 am:
f848c43b58
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439636
Change-Id: Ic69891015dc69f28b874e12e775c43b4a79442ef
Hansong Zhang [Sat, 26 Sep 2020 22:48:00 +0000 (22:48 +0000)]
Use gatt_on_l2cap_error for error handling am:
e8dc945f4d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439958
Change-Id: If3d908794800893809af613fbf2e8074801eaa71
Hansong Zhang [Sat, 26 Sep 2020 22:47:56 +0000 (22:47 +0000)]
Simplify bnep_on_l2cap_error am:
3b18048449
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439957
Change-Id: Id3c875a660cbfcb4ee6ced2bb9ff295246e717b9
Hansong Zhang [Sat, 26 Sep 2020 22:47:51 +0000 (22:47 +0000)]
Use bnep_on_l2cap_error for error handling am:
44b477a8bc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439956
Change-Id: I802e48ec1b85f25fab4b78fffd694b1eb04f7f46
Hansong Zhang [Sat, 26 Sep 2020 22:47:48 +0000 (22:47 +0000)]
Simplify sdp_on_l2cap_error am:
c86dcd3704
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439955
Change-Id: Ic1e19306b0ecb910bd748253c4942a2d27747c1c
Hansong Zhang [Sat, 26 Sep 2020 22:47:43 +0000 (22:47 +0000)]
SDP failure reason isn't used am:
bd04c8dcd3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439954
Change-Id: Icd7308889c4a0539d0dfec6dafe4331565ce3817
Hansong Zhang [Sat, 26 Sep 2020 22:47:38 +0000 (22:47 +0000)]
SDP: Move L2cap error handling to one place am:
ceac9ce032
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439953
Change-Id: I3b3da3e0744c427ab6cd59aef7e6cd369cf5c755
Hansong Zhang [Sat, 26 Sep 2020 22:47:34 +0000 (22:47 +0000)]
Remove unused code in l2c_api am:
3fd840f421
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439952
Change-Id: Ife055cc136ed77f80a45feb0193d10db676a5c44
Hansong Zhang [Sat, 26 Sep 2020 22:46:46 +0000 (22:46 +0000)]
Remove L2CA_ErtmConnectRsp am:
11e328e0d4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439636
Change-Id: I34423e5fddcd4364baee29219edfafea54dcd9eb
Hansong Zhang [Sat, 26 Sep 2020 06:22:17 +0000 (06:22 +0000)]
Remove L2CA_ErtmConnectReq am:
415e2e80ff am:
f85d6033f4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439635
Change-Id: I95dc17d47f42794b627e8be04fd8ae1bbb29743b
Hansong Zhang [Sat, 26 Sep 2020 06:22:13 +0000 (06:22 +0000)]
L2CAP: Use ERTM info during registration, not conn req am:
1877084886 am:
bb9c4fa0f2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439634
Change-Id: I391d8a2688af0b7ce3a99a174eed8fa8dd92097e
Hansong Zhang [Sat, 26 Sep 2020 05:51:13 +0000 (05:51 +0000)]
Remove L2CA_ErtmConnectReq am:
415e2e80ff
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439635
Change-Id: Ifb146de6d763c881c42b47e813b7c31d22d5a835
Hansong Zhang [Sat, 26 Sep 2020 05:50:27 +0000 (05:50 +0000)]
L2CAP: Use ERTM info during registration, not conn req am:
1877084886
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439634
Change-Id: I5985b42406af81a0dd00737fec8882b86898cb84
Hansong Zhang [Sat, 26 Sep 2020 01:41:37 +0000 (01:41 +0000)]
Clean up unused defines and imports am:
f1ed22df09 am:
11c9073097
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439633
Change-Id: I2a8c6e1d5b5715e82e8540543370f5d698548cea
Hansong Zhang [Sat, 26 Sep 2020 01:41:35 +0000 (01:41 +0000)]
L2cap user: Use ConfigCfm_Cb as channel open indicator am:
2304c36e52 am:
3edbe3c427
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439632
Change-Id: I74854e4a4587e7c12f03a5d919b9b84692f2c22b
Hansong Zhang [Sat, 26 Sep 2020 01:41:34 +0000 (01:41 +0000)]
L2C_CSM: Send ConfigCfm to user after ConfigInd am:
4bac7e4a78 am:
4e5d878fe8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439775
Change-Id: I46888c527760a6f7dcaab6714ca3f7cd297e67d8
Hansong Zhang [Sat, 26 Sep 2020 01:41:33 +0000 (01:41 +0000)]
L2CA_ConfigCfm_Cb only need to provide result am:
da8ec43139 am:
f3201c3c3b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439774
Change-Id: I4f05c1135157c3f5945dfa5e68b3e5f8c204534d
Hansong Zhang [Sat, 26 Sep 2020 01:41:31 +0000 (01:41 +0000)]
HIDD: Treat unacceptable QOS as normal failure am:
3c87d00189 am:
e5c650c227
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439773
Change-Id: I7a5f7bf0451ce3f9b875cd90b8240a98c183d7a1
Hansong Zhang [Sat, 26 Sep 2020 01:41:29 +0000 (01:41 +0000)]
L2CA_ConfigReq and L2CA_ConfigRsp are internal now am:
acc416288e am:
469629acc2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439772
Change-Id: Idfaf325b7d4ef9de3369ebcd7dc1c0c4b8ea3871
Hansong Zhang [Sat, 26 Sep 2020 01:41:27 +0000 (01:41 +0000)]
Remove L2CA_ConfigReq in client code am:
e91542d478 am:
55776d6d6a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439451
Change-Id: I798ab375e33ad2ba4dca3c2d006898314ceee523
Hansong Zhang [Sat, 26 Sep 2020 01:41:25 +0000 (01:41 +0000)]
L2CAP module will send ConfigReq for you am:
65acfa23cf am:
f1d3cdc3b3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438418
Change-Id: I5775f7e30de43213ff13a783e235b572749c1a78
Hansong Zhang [Sat, 26 Sep 2020 01:41:23 +0000 (01:41 +0000)]
L2CAP: Don't allow sending re-config am:
db34984d29 am:
ad09212a89
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438672
Change-Id: Ica13009f4be10e74ddfb74e3177b1529f7c167a2
Hansong Zhang [Sat, 26 Sep 2020 01:41:21 +0000 (01:41 +0000)]
L2CA_ConfigRsp is always invoked with status OK am:
8588d5cdd1 am:
ee1e17e709
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438671
Change-Id: I6a9f1a308b44f8f15f17e80628b58551e31e8707
Hansong Zhang [Sat, 26 Sep 2020 01:41:19 +0000 (01:41 +0000)]
L2CAP: Provide a default ERTM option am:
0640f93856 am:
6721ca6f6d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438417
Change-Id: I130ad57b81589add56b042d507c16c6a2a2f3981
Hansong Zhang [Sat, 26 Sep 2020 01:41:17 +0000 (01:41 +0000)]
Some ERTM values are constant am:
1b6d60e504 am:
75af19b15d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438416
Change-Id: I150d26e8c52f2f56749a7ec59dc0586dc5aa366d
Hansong Zhang [Sat, 26 Sep 2020 01:41:15 +0000 (01:41 +0000)]
Remove unnecessary definition am:
989e83b5c1 am:
d675b7bc07
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438415
Change-Id: Ia9b0091b3c17991b3f8df23fc6deeaf2b62f947d
Treehugger Robot [Sat, 26 Sep 2020 01:40:51 +0000 (01:40 +0000)]
Merge "HciCaptures: Add CommandComplete" am:
08fd1d6421 am:
38ec6d219a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438313
Change-Id: Iac9663d9cb401b260bbdef9dd1edcc38f32c5c9a
Hansong Zhang [Sat, 26 Sep 2020 01:20:51 +0000 (01:20 +0000)]
Clean up unused defines and imports am:
f1ed22df09
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439633
Change-Id: I27bd6dc4a030a76d2b0a196eeb749505f23dfdef
Hansong Zhang [Sat, 26 Sep 2020 01:20:48 +0000 (01:20 +0000)]
L2cap user: Use ConfigCfm_Cb as channel open indicator am:
2304c36e52
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439632
Change-Id: I1ee0509fb3773e0c74a2ea27e40b7172909b2972
Hansong Zhang [Sat, 26 Sep 2020 01:20:44 +0000 (01:20 +0000)]
L2C_CSM: Send ConfigCfm to user after ConfigInd am:
4bac7e4a78
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439775
Change-Id: Ie274e249a4865bcbe8cb3a8b52f2ec9dc6139c38
Hansong Zhang [Sat, 26 Sep 2020 01:20:40 +0000 (01:20 +0000)]
L2CA_ConfigCfm_Cb only need to provide result am:
da8ec43139
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439774
Change-Id: Ie88ef37e16467bd8809df2ca44d710fc56a775fc
Hansong Zhang [Sat, 26 Sep 2020 01:20:36 +0000 (01:20 +0000)]
HIDD: Treat unacceptable QOS as normal failure am:
3c87d00189
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439773
Change-Id: Ib50488e6972f13614ac9fa352032213221650a62
Hansong Zhang [Sat, 26 Sep 2020 01:20:31 +0000 (01:20 +0000)]
L2CA_ConfigReq and L2CA_ConfigRsp are internal now am:
acc416288e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439772
Change-Id: I0cbd5d725f6053d051f35b1e40c98fe6883a25c5
Hansong Zhang [Sat, 26 Sep 2020 01:20:27 +0000 (01:20 +0000)]
Remove L2CA_ConfigReq in client code am:
e91542d478
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439451
Change-Id: I68652917693600c85d10e10574c5f4f64d7c51f6
Hansong Zhang [Sat, 26 Sep 2020 01:20:24 +0000 (01:20 +0000)]
L2CAP module will send ConfigReq for you am:
65acfa23cf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438418
Change-Id: I4ea5f0e86c2bf834b348f7f3750517f0fed4550f
Hansong Zhang [Sat, 26 Sep 2020 01:20:20 +0000 (01:20 +0000)]
L2CAP: Don't allow sending re-config am:
db34984d29
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438672
Change-Id: If31d05d271340f2dd41561a4bc7142f223b9927b
Hansong Zhang [Sat, 26 Sep 2020 01:20:15 +0000 (01:20 +0000)]
L2CA_ConfigRsp is always invoked with status OK am:
8588d5cdd1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438671
Change-Id: I593f15a4d4157df2a7109c2c43d74559a7cbabd8
Hansong Zhang [Sat, 26 Sep 2020 01:20:12 +0000 (01:20 +0000)]
L2CAP: Provide a default ERTM option am:
0640f93856
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438417
Change-Id: I18acbf65f5eab682de8073b98875f828da5056fa
Hansong Zhang [Sat, 26 Sep 2020 01:20:07 +0000 (01:20 +0000)]
Some ERTM values are constant am:
1b6d60e504
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438416
Change-Id: I0803905600edcfd0c0012d51917c584815ef87d8
Hansong Zhang [Sat, 26 Sep 2020 01:20:03 +0000 (01:20 +0000)]
Remove unnecessary definition am:
989e83b5c1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438415
Change-Id: I82073c462fe23457dc86e2cb3580de5da844b8d0
Treehugger Robot [Sat, 26 Sep 2020 01:19:01 +0000 (01:19 +0000)]
Merge "HciCaptures: Add CommandComplete" am:
08fd1d6421
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438313
Change-Id: Idc051f11ee5ccf06d7b241fb5dc66261ae34bc0f
Hansong Zhang [Sat, 26 Sep 2020 00:03:33 +0000 (17:03 -0700)]
Use gap_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8faaa5f586e3133d1a5c7ff890ad27a87ee9433a
Hansong Zhang [Fri, 25 Sep 2020 23:54:05 +0000 (16:54 -0700)]
Use gatt_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7a2fbc5805662270588d152ead932ffa02fc9dc6
Hansong Zhang [Fri, 25 Sep 2020 23:37:51 +0000 (16:37 -0700)]
Simplify bnep_on_l2cap_error
Both cases are doing the same thing.
Error reason isn't used throughout the stack.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib3793f96c0d8a2907fc41d9a24712d2db78a0665
Hansong Zhang [Fri, 25 Sep 2020 23:37:05 +0000 (16:37 -0700)]
Use bnep_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ieb28a7bbdea106a5e51e9bf996ecba9dab71f15a
Hansong Zhang [Fri, 25 Sep 2020 23:29:29 +0000 (16:29 -0700)]
Simplify sdp_on_l2cap_error
Both cases are doing the same thing (send disconnect request is no-op if
channel is not open, and then free the control block).
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9b29899164b00fd9072e4dc37cfc30dd095c3524
Hansong Zhang [Fri, 25 Sep 2020 23:27:47 +0000 (16:27 -0700)]
SDP failure reason isn't used
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1ee477914c1f13f43f868a28f18b372e36baf752
Hansong Zhang [Fri, 25 Sep 2020 23:24:52 +0000 (16:24 -0700)]
SDP: Move L2cap error handling to one place
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I903127f07ae97349d1fa7625d20835b46dbe9063
Hansong Zhang [Fri, 25 Sep 2020 23:16:48 +0000 (16:16 -0700)]
Remove unused code in l2c_api
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifdcb0a14919e75103796246cddb9011393e0035a
Hansong Zhang [Fri, 25 Sep 2020 22:32:40 +0000 (15:32 -0700)]
Remove L2CA_ErtmConnectRsp
Just use L2CA_ConnectRsp.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie95ed09c9d2e79fabd9d6eae6a038a6896a8e558
Hansong Zhang [Fri, 25 Sep 2020 22:27:51 +0000 (15:27 -0700)]
Remove L2CA_ErtmConnectReq
Now that the p_ertm_info parameter is unused, just use L2CA_ConnectReq.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I458e0d8bcc2809c8bc2d295be29516be05bf05ba
Hansong Zhang [Fri, 25 Sep 2020 22:18:09 +0000 (15:18 -0700)]
L2CAP: Use ERTM info during registration, not conn req
ERTM info is stored in p_ccb->p_rcb. Use that as the source of truth.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I78c3d65fdaf14addf80607ce5105221e52447a9e
Hansong Zhang [Fri, 25 Sep 2020 21:57:49 +0000 (14:57 -0700)]
Clean up unused defines and imports
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5c47ee320085664b3db68ff4a5860aa931d1376d
Hansong Zhang [Fri, 25 Sep 2020 21:32:11 +0000 (14:32 -0700)]
L2cap user: Use ConfigCfm_Cb as channel open indicator
When the user receives ConfigCfm_Cb, it's guaranteed that ConfigInd_Cb
is received with correct option enforced.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6de12f1ba6e9612f6a84b399e7fc984a7f3c3c72
Hansong Zhang [Fri, 25 Sep 2020 20:24:55 +0000 (13:24 -0700)]
L2C_CSM: Send ConfigCfm to user after ConfigInd
This way, users know that a ConfigCfm event with status OK means channel
is established. No need to further keep track of state.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I90295349c53d57aa859c5bb65e6f28a299714b3d
Hansong Zhang [Fri, 25 Sep 2020 19:39:16 +0000 (12:39 -0700)]
L2CA_ConfigCfm_Cb only need to provide result
Users only care about result.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ife07db2454f938fb1dd1b7fde2136b8de887fa3b
Hansong Zhang [Fri, 25 Sep 2020 19:17:12 +0000 (12:17 -0700)]
HIDD: Treat unacceptable QOS as normal failure
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7d37c46f7c6b16a55afafe04b62081d43f63c122
Hansong Zhang [Fri, 25 Sep 2020 18:31:02 +0000 (11:31 -0700)]
L2CA_ConfigReq and L2CA_ConfigRsp are internal now
Only used by l2c_csm, so we make an internal version instead.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If725c705bcbabec025cb16d063cd4d4aa4b319f9
Hansong Zhang [Fri, 25 Sep 2020 18:15:00 +0000 (11:15 -0700)]
Remove L2CA_ConfigReq in client code
Let L2CAP do this for you.
HIDD used to send anothe ConfigReq if the remote HIDH wants a different
QOS. We drop this adjustment for now. QOS is not used. Regard this as a
normal config error. This simplifies the workflow.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic3ff08a4b876462fec697ffa8a09fc8bca943603
Hansong Zhang [Fri, 25 Sep 2020 04:32:08 +0000 (21:32 -0700)]
L2CAP module will send ConfigReq for you
No need to send it in client code.
Will get rid of the fake L2CA_ConfigReq() next.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I66e2efad144e76eb6abfa6d421e12ae4a60d8e1f
Hansong Zhang [Fri, 25 Sep 2020 07:04:44 +0000 (00:04 -0700)]
L2CAP: Don't allow sending re-config
There is no use case. Remove the support for now. This makes L2CAP state
machine more complicated.
Note that we don't handle re-config request from remote gracefully. For
example, RFCOMM will simply disconnect.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1d2a420e4f904b7e935715f327171d133760eab3
Hansong Zhang [Fri, 25 Sep 2020 06:28:56 +0000 (23:28 -0700)]
L2CA_ConfigRsp is always invoked with status OK
So we can move some error processing logic.
Also we never send a config with continuation flag.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6c5e05b39a76138f90b41a0e56b7bfd73f056455
Hansong Zhang [Fri, 25 Sep 2020 04:20:37 +0000 (21:20 -0700)]
L2CAP: Provide a default ERTM option
Note that the existing ERTM options for AVCT_BR and GAP OBEX are almost
the same, and the only difference is TxWindow (10 and 20). Providing a
default value of 10 won't make a difference.
Use the same ERTM option so that later L2CAP can send config request for
them.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I410045f47c643fd4a152ae44722e905b2ce01197
Hansong Zhang [Fri, 25 Sep 2020 03:59:13 +0000 (20:59 -0700)]
Some ERTM values are constant
Remove unnecessary definition.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2cb74575a57262e11ebc389a3f9473702dbb13b4
Hansong Zhang [Fri, 25 Sep 2020 03:45:11 +0000 (20:45 -0700)]
Remove unnecessary definition
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9baf600d22cad78b2b93d29dd7d8975731beb47d
Treehugger Robot [Sat, 26 Sep 2020 00:51:46 +0000 (00:51 +0000)]
Merge "HciCaptures: Add CommandComplete"
Hansong Zhang [Fri, 25 Sep 2020 23:14:36 +0000 (23:14 +0000)]
Let L2CAP send ConfigRsp for you am:
75d1c63ba5 am:
c00171736f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438234
Change-Id: I2872c55f5637ea68e85c1d01aa3ebc68bded0f15
Chris Manton [Fri, 25 Sep 2020 23:14:21 +0000 (23:14 +0000)]
Straighten out stack/acl/btm_acl::btm_read_remote_version_complete am:
d64f464405 am:
dce4e2f847
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438551
Change-Id: I21a1003225894781a9fc338b9e099ee216381977
Chris Manton [Fri, 25 Sep 2020 23:14:19 +0000 (23:14 +0000)]
Add gd/l2cap::OnReadRemoteVersionInformationComplete am:
11131aa71b am:
cd50f3afcf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438552
Change-Id: I63c96c495e362e433dcb7b3c35915cba77a3924d
Hansong Zhang [Fri, 25 Sep 2020 22:55:30 +0000 (22:55 +0000)]
Let L2CAP send ConfigRsp for you am:
75d1c63ba5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1438234
Change-Id: I18cd60e397d3d74dbf2827918010b08e443b2f7d