OSDN Git Service
Hansong Zhang [Mon, 28 Sep 2020 22:02:58 +0000 (22:02 +0000)]
Simplify avdt_sec_check_complete_term am:
1d6fa5e136 am:
41cb6069c9 am:
4d1656d1ea
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439087
Change-Id: I308d2990de91b66bd32d32551bca5e58ef26a851
Hansong Zhang [Mon, 28 Sep 2020 22:02:56 +0000 (22:02 +0000)]
Simplify bnep_sec_check_complete am:
86fbde4a5e am:
e96b0443a4 am:
57455d8f4d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439086
Change-Id: I8ecdf770320d59674245cb6c5bdf54316d25e47d
Hansong Zhang [Mon, 28 Sep 2020 21:41:30 +0000 (21:41 +0000)]
Simplify avdt_sec_check_complete_term am:
1d6fa5e136 am:
41cb6069c9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439087
Change-Id: I3a2c972f6d2103003156efef3df8035d9658451d
Hansong Zhang [Mon, 28 Sep 2020 21:41:27 +0000 (21:41 +0000)]
Simplify bnep_sec_check_complete am:
86fbde4a5e am:
e96b0443a4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439086
Change-Id: I87d9fd1e93064f2b4c0a9f2cd3387a38698c8146
Hansong Zhang [Mon, 28 Sep 2020 20:54:24 +0000 (20:54 +0000)]
Simplify avdt_sec_check_complete_term am:
1d6fa5e136
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439087
Change-Id: Ie361553e46e0bf5c56503b0a1153d9791bba476f
Hansong Zhang [Mon, 28 Sep 2020 20:53:44 +0000 (20:53 +0000)]
Simplify bnep_sec_check_complete am:
86fbde4a5e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439086
Change-Id: Idb4a0b924b656e23556d6161da055fe6a8de2398
Hansong Zhang [Mon, 28 Sep 2020 20:13:35 +0000 (20:13 +0000)]
l2c_csm: Use pL2CA_Error_Cb on error am:
30a07c56e1 am:
7f4a3dac18 am:
76d953e9b6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439085
Change-Id: I3256c8fce9a6949953aeec0a9f9455c303849462
Hansong Zhang [Mon, 28 Sep 2020 20:13:32 +0000 (20:13 +0000)]
Regard L2CAP_CFG_PENDING as failure am:
5b85860bd5 am:
eb9cc47787 am:
48584bc8ab
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439084
Change-Id: Ice44d8442da97fc1e77e57ff3b5bdbc984169f2c
Hansong Zhang [Mon, 28 Sep 2020 19:55:17 +0000 (19:55 +0000)]
l2c_csm: Use pL2CA_Error_Cb on error am:
30a07c56e1 am:
7f4a3dac18
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439085
Change-Id: Ib1984734eda6f9ce33fcbefce71d59ffc68d34b0
Hansong Zhang [Mon, 28 Sep 2020 19:55:15 +0000 (19:55 +0000)]
Regard L2CAP_CFG_PENDING as failure am:
5b85860bd5 am:
eb9cc47787
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439084
Change-Id: I9aca2ee3eaa75ae8e5b855cf1c4ccadc2e9202bb
Hansong Zhang [Mon, 28 Sep 2020 19:03:43 +0000 (19:03 +0000)]
l2c_csm: Use pL2CA_Error_Cb on error am:
30a07c56e1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439085
Change-Id: I5d53012f81c0ee4358948654418600b897f1f34b
Hansong Zhang [Mon, 28 Sep 2020 19:02:50 +0000 (19:02 +0000)]
Regard L2CAP_CFG_PENDING as failure am:
5b85860bd5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439084
Change-Id: I9d42ccf85dc915acb2561a63d2718bbb1d5c08bf
Hansong Zhang [Mon, 28 Sep 2020 17:31:22 +0000 (17:31 +0000)]
Introduce pL2CA_Error_Cb am:
b6e5a07555 am:
cc102a7286 am:
0dcc4aea20
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439083
Change-Id: I2a938c79536402305cd1097f6a2bd8deea68a001
Hansong Zhang [Mon, 28 Sep 2020 17:31:19 +0000 (17:31 +0000)]
l2c_csm: Remove unused variable am:
5020f1c00f am:
1e68d372f3 am:
9f16dc312c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439082
Change-Id: I0ee02fd48260243ef426688765bf05db344a0811
Hansong Zhang [Mon, 28 Sep 2020 17:09:20 +0000 (17:09 +0000)]
Introduce pL2CA_Error_Cb am:
b6e5a07555 am:
cc102a7286
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439083
Change-Id: Icae7a509d9d3cdd276e8911175c02408ce44dd58
Hansong Zhang [Mon, 28 Sep 2020 17:09:17 +0000 (17:09 +0000)]
l2c_csm: Remove unused variable am:
5020f1c00f am:
1e68d372f3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439082
Change-Id: I471805d4fb858f14122a743102788ec7f19fcd24
Hansong Zhang [Mon, 28 Sep 2020 16:48:11 +0000 (16:48 +0000)]
Introduce pL2CA_Error_Cb am:
b6e5a07555
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439083
Change-Id: I4af7949c994761ee6b3a7b6c2808a8077fafdfc7
Hansong Zhang [Mon, 28 Sep 2020 16:47:19 +0000 (16:47 +0000)]
l2c_csm: Remove unused variable am:
5020f1c00f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439082
Change-Id: I7a4ad9d2b31de4811798dcbb206702be137de7b2
Hansong Zhang [Sun, 27 Sep 2020 00:59:51 +0000 (17:59 -0700)]
Simplify avdt_sec_check_complete_term
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iabddefde41cc2f63b306efe0cd4eb7e59116141b
Hansong Zhang [Sun, 27 Sep 2020 00:42:02 +0000 (17:42 -0700)]
Simplify bnep_sec_check_complete
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifc0edea758f4d1e0847f5b00fc49b51b4ad00344
Hansong Zhang [Sat, 26 Sep 2020 23:58:47 +0000 (16:58 -0700)]
l2c_csm: Use pL2CA_Error_Cb on error
Note that we only have two result codes, because the user only needs to
know whether it's during ConnectRsp or ConfigRsp (except for HIDH
retry), which we need further research.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I24aa7bf8487c9b2b69fc455cfdb52a7ec758b90b
Hansong Zhang [Sat, 26 Sep 2020 23:48:40 +0000 (16:48 -0700)]
Regard L2CAP_CFG_PENDING as failure
Since all L2CAP users disconnect if the status is not OK.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I112400c2081be12d038426c1e8ea82229d5b9f4a
Hansong Zhang [Sat, 26 Sep 2020 23:39:28 +0000 (16:39 -0700)]
Introduce pL2CA_Error_Cb
L2CAP notifies users error in ConnectRsp and ConfigRsp through this
callback function (not linked so far). Next step is we send success
through pL2CA_ConnectCfm_Cb and pL2CA_ConfigCfm_Cb.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4456487d36248408fc1c31403d107baef05e3646
Hansong Zhang [Sat, 26 Sep 2020 23:20:31 +0000 (16:20 -0700)]
l2c_csm: Remove unused variable
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie11caa34cc55ed7e4aa6789df4cf08725998c73a
Treehugger Robot [Mon, 28 Sep 2020 03:45:33 +0000 (03:45 +0000)]
Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux" am:
960730c35b am:
c45116e6e5 am:
a430fb8a56
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439973
Change-Id: If75103e0e812e67a70f9f46d53575d1e0a84e97a
Treehugger Robot [Mon, 28 Sep 2020 03:32:59 +0000 (03:32 +0000)]
Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux" am:
960730c35b am:
c45116e6e5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439973
Change-Id: I969910892c7a24aedbf42e03bca7d9a4f9484844
Treehugger Robot [Mon, 28 Sep 2020 03:01:03 +0000 (03:01 +0000)]
Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux" am:
960730c35b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439973
Change-Id: Ic78e1a205f0e6c32291968257f6e069b1579dfb9
Treehugger Robot [Mon, 28 Sep 2020 02:28:06 +0000 (02:28 +0000)]
Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux"
Treehugger Robot [Mon, 28 Sep 2020 01:31:10 +0000 (01:31 +0000)]
Merge "Set apex_available property" am:
9a5637591a am:
f99b45ed3d am:
61d8361c56
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432812
Change-Id: I65c48bdce23f76e1be79dfb8f48ecb0bb2c61a05
Treehugger Robot [Mon, 28 Sep 2020 00:57:12 +0000 (00:57 +0000)]
Merge "Set apex_available property" am:
9a5637591a am:
f99b45ed3d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432812
Change-Id: Iea0150cbb7c04df34d3f15acbe424c4f15593934
Treehugger Robot [Mon, 28 Sep 2020 00:38:30 +0000 (00:38 +0000)]
Merge "Set apex_available property" am:
9a5637591a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1432812
Change-Id: I56e4f7d5776bace6a9bec765aedc4a6f34add49f
Treehugger Robot [Mon, 28 Sep 2020 00:05:12 +0000 (00:05 +0000)]
Merge "Set apex_available property"
Hansong Zhang [Sun, 27 Sep 2020 16:47:50 +0000 (16:47 +0000)]
L2CAP ERTM: Fix p_ccb->max_rx_mtu am:
8308c24d8a am:
3e88869b74 am:
90a30506ad
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439081
Change-Id: I1f24834646a08017c4026a9c811485bde4df8bfc
Hansong Zhang [Sun, 27 Sep 2020 16:34:17 +0000 (16:34 +0000)]
L2CAP ERTM: Fix p_ccb->max_rx_mtu am:
8308c24d8a am:
3e88869b74
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439081
Change-Id: Ib50039db4ee485c69e51bb8fe7efc42ec6f20135
Hansong Zhang [Sun, 27 Sep 2020 16:11:38 +0000 (16:11 +0000)]
L2CAP ERTM: Fix p_ccb->max_rx_mtu am:
8308c24d8a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439081
Change-Id: I07e1644a16015e7ec5d7876a365a28ecf4eee2de
Hansong Zhang [Sun, 27 Sep 2020 08:19:18 +0000 (08:19 +0000)]
Use hidh_on_l2cap_error for error handling am:
95149a585c am:
2170acaf97 am:
3a33c8af12
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439959
Change-Id: Idb941b6b98f3dc293c2098eb88034ac9c6bcabc3
Hansong Zhang [Sun, 27 Sep 2020 08:19:17 +0000 (08:19 +0000)]
Use hidd_on_l2cap_error for error handling am:
407ad73659 am:
39bb8732ce am:
9758cb6f5f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439638
Change-Id: I173cc0e65d727ec7c89a27bb31c34d1fda3f8aed
Hansong Zhang [Sun, 27 Sep 2020 08:19:15 +0000 (08:19 +0000)]
HID: Simplify security check code am:
a412f6bbb3 am:
0959d40562 am:
79adca1aa0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439965
Change-Id: I0a82f337914dd9ae4d4eab6fa59222c8fd26ed84
Hansong Zhang [Sun, 27 Sep 2020 08:19:12 +0000 (08:19 +0000)]
Use rfc_on_l2cap_error for error handling am:
d3c390b077 am:
ab41398cec am:
d610c365aa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439637
Change-Id: I69ccb1002c7c5e10a9cbdc78bf23ca748300cf7d
Hansong Zhang [Sun, 27 Sep 2020 08:19:10 +0000 (08:19 +0000)]
Use avct_on_l2cap_error for error handling am:
4e82f0d26c am:
45353d3326 am:
5e21b02228
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439964
Change-Id: I2f13911309bc8d89caa3fff64ff97a94a785b3d3
Hansong Zhang [Sun, 27 Sep 2020 08:19:09 +0000 (08:19 +0000)]
Use avdt_on_l2cap_error for error handling am:
ece51101ed am:
c06e9e0a8d am:
e1e75053a1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439963
Change-Id: Icb24390a2f2fd8e35d838d78bcdd0bd5ddc8a5b8
Hansong Zhang [Sun, 27 Sep 2020 08:19:05 +0000 (08:19 +0000)]
Use avct_br_on_l2cap_error am:
4e00fa771a am:
df5d0dee30 am:
b74c13572b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439962
Change-Id: Ia31da2c63ea7bf9f29c46a77a8d22e904c55ad9e
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 [Sun, 27 Sep 2020 06:38:13 +0000 (23:38 -0700)]
L2CAP ERTM: Fix p_ccb->max_rx_mtu
Use the old value, which was removed in
I78c3d65fdaf14addf80607ce5105221e52447a9e.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working & OPP
Change-Id: I90a8f94d16f87df2d4ce8bb0de8130d544affd12
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 01:04:58 +0000 (01:04 +0000)]
Use gap_on_l2cap_error for error handling am:
09f5d7f465 am:
7e70de9892 am:
9d027171a9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439960
Change-Id: I6d4d8da535e07937f873318175d977101ab61985
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:36:07 +0000 (23:36 +0000)]
Use gatt_on_l2cap_error for error handling am:
e8dc945f4d am:
1ff9532d2b am:
75d0f3e73c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439958
Change-Id: I47b8b1c337a8585b99808e8105c5bf5f2e07ad57
Hansong Zhang [Sat, 26 Sep 2020 23:36:05 +0000 (23:36 +0000)]
Simplify bnep_on_l2cap_error am:
3b18048449 am:
4ec67658f4 am:
89c00cdc09
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439957
Change-Id: Ie148cea33df431ba11e9f5c62aed763d509565e8
Hansong Zhang [Sat, 26 Sep 2020 23:36:03 +0000 (23:36 +0000)]
Use bnep_on_l2cap_error for error handling am:
44b477a8bc am:
cb2dd251df am:
c30c230d53
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439956
Change-Id: Ibca8d7de765255d324d120720a86b91e675b04d6
Hansong Zhang [Sat, 26 Sep 2020 23:36:01 +0000 (23:36 +0000)]
Simplify sdp_on_l2cap_error am:
c86dcd3704 am:
fc9c30fb8f am:
daceeaebcb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439955
Change-Id: Ia98d362d4986f404d4242159d72fb55e4f577713
Hansong Zhang [Sat, 26 Sep 2020 23:35:59 +0000 (23:35 +0000)]
SDP failure reason isn't used am:
bd04c8dcd3 am:
2a521b89ae am:
38867d3ff7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439954
Change-Id: If6d8a0ff72f60ff393ae6d18b055c5c383f0d165
Hansong Zhang [Sat, 26 Sep 2020 23:35:57 +0000 (23:35 +0000)]
SDP: Move L2cap error handling to one place am:
ceac9ce032 am:
81acebad6f am:
490a3305f8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439953
Change-Id: Ibff7da84397331efa02452405dcc8aa16c23adf8
Hansong Zhang [Sat, 26 Sep 2020 23:35:55 +0000 (23:35 +0000)]
Remove unused code in l2c_api am:
3fd840f421 am:
beea7302e3 am:
a8947cfdc0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439952
Change-Id: If916de0aa21f9ea7923c0124a2b28754cbcc1a68
Hansong Zhang [Sat, 26 Sep 2020 23:35:52 +0000 (23:35 +0000)]
Remove L2CA_ErtmConnectRsp am:
11e328e0d4 am:
f848c43b58 am:
b9970a895f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439636
Change-Id: I9c5aa12790ed37f7631d72c0cdb0e3bf313861fc
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
Tianyu Jiang [Fri, 25 Sep 2020 22:36:20 +0000 (15:36 -0700)]
Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux
so that hwasan build succeeds.
Test: lunch aosp_??????-userdebug && m SANITIZE_TARGET=hwaddress -j36
Bug:
169083233
Change-Id: I78da891664c2667aa449969b6f06f030e624b2e7
(cherry picked from commit
7181fb9f9e6823e06e718de5727f123b4073e05e)
Hansong Zhang [Sat, 26 Sep 2020 06:33:51 +0000 (06:33 +0000)]
Remove L2CA_ErtmConnectReq am:
415e2e80ff am:
f85d6033f4 am:
370a428031
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439635
Change-Id: I5945f22c9cbc8d2edc219efd8e02899b0503b79f
Hansong Zhang [Sat, 26 Sep 2020 06:33:48 +0000 (06:33 +0000)]
L2CAP: Use ERTM info during registration, not conn req am:
1877084886 am:
bb9c4fa0f2 am:
82b456b611
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439634
Change-Id: I2ab3e07c27151bf5c305b924c47ec9480975716e
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 02:06:10 +0000 (02:06 +0000)]
Clean up unused defines and imports am:
f1ed22df09 am:
11c9073097 am:
5d45c835a9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439633
Change-Id: I17339574cd7739c902d41d35d800696c329ec262
Hansong Zhang [Sat, 26 Sep 2020 02:06:07 +0000 (02:06 +0000)]
L2cap user: Use ConfigCfm_Cb as channel open indicator am:
2304c36e52 am:
3edbe3c427 am:
ee2d84453a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1439632
Change-Id: Id4786687719780039046fe899d334e4bcbe4914c