OSDN Git Service
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: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 22:33:27 +0000 (22:33 +0000)]
SDP code clean up am:
9b7b90aabf am:
027614ac01
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435157
Change-Id: I96fa4073b020c3625fe9a7a764f633d331bf0a1f
Hansong Zhang [Wed, 23 Sep 2020 22:33:25 +0000 (22:33 +0000)]
pL2CA_DisconnectCfm_Cb is unused am:
b803f44d90 am:
6480ed0415
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435156
Change-Id: I62cb8f42f672f8c61a5424d59eb7eb70949e549b
Hansong Zhang [Wed, 23 Sep 2020 22:33:23 +0000 (22:33 +0000)]
HIDH: Move L2cap disconnect logic together am:
ba20fb9716 am:
b669795777
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435155
Change-Id: Ic05639b6645d79bc9627a1145eaf273a600bd11b
Hansong Zhang [Wed, 23 Sep 2020 22:33:21 +0000 (22:33 +0000)]
HIDD: Move L2cap disconnect logic together am:
b69ff0c16c am:
25f2ef478d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435154
Change-Id: I3e431c9b5db8da2235bb41d427f6adeba402773c
Hansong Zhang [Wed, 23 Sep 2020 22:33:19 +0000 (22:33 +0000)]
AVCT: Move L2cap disconnect logic together am:
99a0ebf3ec am:
2d2db9925d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435153
Change-Id: I45dd969a41631b68d8d100026f8b02bba0835404
Hansong Zhang [Wed, 23 Sep 2020 22:33:17 +0000 (22:33 +0000)]
AVCT_BR: Move L2cap disconnect logic together am:
08c437d37c am:
13363d059e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435152
Change-Id: Icb2d60c760780856cb661a4eb283cd87f2dc9e21
Hansong Zhang [Wed, 23 Sep 2020 22:33:15 +0000 (22:33 +0000)]
AVDT: Move L2cap disconnect logic together am:
75b25c50b6 am:
cfb683ff01
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435007
Change-Id: Ib571b61cf7eda3bb36ff6f7dcc70347b7e094c66
Hansong Zhang [Wed, 23 Sep 2020 22:33:11 +0000 (22:33 +0000)]
Remove unused parameter in avdt_ad_tc_close_ind am:
1510436dd6 am:
48f5fffbf0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435006
Change-Id: I28eb9b7d9e2e14426874247842f2f00b865c93b1
Hansong Zhang [Wed, 23 Sep 2020 22:15:19 +0000 (22:15 +0000)]
SDP code clean up am:
9b7b90aabf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435157
Change-Id: I716d48bb1af4c6a4bcf6db956835bd6fdb033dde
Hansong Zhang [Wed, 23 Sep 2020 22:15:15 +0000 (22:15 +0000)]
pL2CA_DisconnectCfm_Cb is unused am:
b803f44d90
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435156
Change-Id: Icf4ca83d506b8c498243ee962036444260f5effe
Hansong Zhang [Wed, 23 Sep 2020 22:15:12 +0000 (22:15 +0000)]
HIDH: Move L2cap disconnect logic together am:
ba20fb9716
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435155
Change-Id: I19041c12c30466257f31df006c33cec3eb28ff36
Hansong Zhang [Wed, 23 Sep 2020 22:15:09 +0000 (22:15 +0000)]
HIDD: Move L2cap disconnect logic together am:
b69ff0c16c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435154
Change-Id: I6336f26c05421d5f65c2ab1f3e457832acb23d0f
Hansong Zhang [Wed, 23 Sep 2020 22:15:05 +0000 (22:15 +0000)]
AVCT: Move L2cap disconnect logic together am:
99a0ebf3ec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435153
Change-Id: Iceb598d61504b4a3f56610a4778b3c7b671b5d5f
Hansong Zhang [Wed, 23 Sep 2020 22:15:02 +0000 (22:15 +0000)]
AVCT_BR: Move L2cap disconnect logic together am:
08c437d37c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435152
Change-Id: I42815fa56bf56ed8ac73e8a75361124482143c94
Hansong Zhang [Wed, 23 Sep 2020 22:14:58 +0000 (22:14 +0000)]
AVDT: Move L2cap disconnect logic together am:
75b25c50b6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435007
Change-Id: I4f4c7d6fa6c667710df429c31dd256af9a78efa2
Hansong Zhang [Wed, 23 Sep 2020 22:14:07 +0000 (22:14 +0000)]
Remove unused parameter in avdt_ad_tc_close_ind am:
1510436dd6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435006
Change-Id: I8d53b55def1c9757c2f9185f1b85a6f1ce600f17
Hansong Zhang [Wed, 23 Sep 2020 05:59:42 +0000 (22:59 -0700)]
SDP code clean up
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0311cc26bf5bf3b6d038dcceb42ede082915c674
Hansong Zhang [Wed, 23 Sep 2020 05:54:01 +0000 (22:54 -0700)]
pL2CA_DisconnectCfm_Cb is unused
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iedfafad7ca0546340230abc18dd2396ef5863fba
Hansong Zhang [Wed, 23 Sep 2020 05:47:15 +0000 (22:47 -0700)]
HIDH: Move L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I734ed32d6daa691fe5a56cb912417fb2b280c7ec
Hansong Zhang [Wed, 23 Sep 2020 05:45:27 +0000 (22:45 -0700)]
HIDD: Move L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ibd180908b31afa018488e3454fa7f88240fb78ab
Hansong Zhang [Wed, 23 Sep 2020 05:32:27 +0000 (22:32 -0700)]
AVCT: Move L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Idfb4d668e49d18b993adbdd622edbcc147badfa5
Hansong Zhang [Wed, 23 Sep 2020 05:29:06 +0000 (22:29 -0700)]
AVCT_BR: Move L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7a5a9e29936fd3022c7b718d48c67b8ea74523f4
Hansong Zhang [Wed, 23 Sep 2020 05:07:03 +0000 (22:07 -0700)]
AVDT: Move L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ice0c606bbaf3467cbbf7cedd266765874d760e66
Hansong Zhang [Wed, 23 Sep 2020 04:58:21 +0000 (21:58 -0700)]
Remove unused parameter in avdt_ad_tc_close_ind
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I888bb41bc28378406d441856ac1e615eb8c970a2
Treehugger Robot [Wed, 23 Sep 2020 21:40:34 +0000 (21:40 +0000)]
Merge "NameDB: Actually remove the address from requested addresses" am:
be6fa9814b am:
39bc6765a3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1433067
Change-Id: Ia31d75a665ac548b5b462b601c67846b17013230
Chris Manton [Sat, 19 Sep 2020 01:15:36 +0000 (18:15 -0700)]
Re-log bta/gatt::bta_gattc_conn_cback
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I5fad51611fb62c197f2860c98470cf32e7afab8d
Chris Manton [Sat, 19 Sep 2020 16:00:37 +0000 (09:00 -0700)]
Re-include btif/src/btif_sock_l2cap
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I7ce390ca7539b8510ad1e42a170fd69b0ab7b9b9
Chris Manton [Sat, 19 Sep 2020 00:52:55 +0000 (17:52 -0700)]
Eliminate socket verbosity print_events()
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ib0b4ea11c811ab409bbef01b6a432bc0db64a62c
Chris Manton [Sat, 19 Sep 2020 00:25:46 +0000 (17:25 -0700)]
Re-log stack/acl::BTM_SwitchRole
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I6cc72e13dc3aac0543d4d3dc7b16113f974be99d
Chris Manton [Fri, 18 Sep 2020 23:54:55 +0000 (16:54 -0700)]
Reduce identical APIs
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ic4a66b2cb8752064bb2bcaf43c6dee20002117f3
Chris Manton [Fri, 18 Sep 2020 23:59:05 +0000 (16:59 -0700)]
Remove #def code conditional BTM_MAX_SCO_LINKS
Ok for constants, poor for code conditionals
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Iae348262a3dc8449efaa7caaf45560918aaff8b7
Chris Manton [Fri, 18 Sep 2020 16:12:31 +0000 (09:12 -0700)]
Remove unused #defs stack/btm/btm_ble_int_types::
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I95c3ddce09f0492e1d6026ecba18ee8f44838261
Chris Manton [Fri, 18 Sep 2020 15:59:31 +0000 (08:59 -0700)]
Internally link stack/btm/btm_ble_gap::btm_send_hci_scan_enable
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I40fd942c5ff05acf4242f2a8e68de35308c1ddb8
Chris Manton [Tue, 22 Sep 2020 23:01:31 +0000 (16:01 -0700)]
Use new APIS stack/acl/btm_acl
internal_.acl_allocate_connection
acl_initialize_power_mode
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Icffd9db5591a746f6c2ebb95abb8461c35dd9f60
Chris Manton [Tue, 22 Sep 2020 21:22:30 +0000 (14:22 -0700)]
Streamline stack/acl/btm_acl::btm_acl_created
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I0b3f15344dc9b7b19f810a39a98e0dc6d46d520b
Chris Manton [Tue, 22 Sep 2020 23:01:31 +0000 (16:01 -0700)]
Add new APIS stack/acl/btm_acl
Towards readable code
internal_.acl_allocate_connection
acl_initialize_power_mode
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ib76feefe0e95557b324dd837c294050da73c8106
Treehugger Robot [Wed, 23 Sep 2020 20:47:31 +0000 (20:47 +0000)]
Merge "NameDB: Actually remove the address from requested addresses" am:
be6fa9814b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1433067
Change-Id: Ibfe7ee87932b6c67755d64a5932aaa9c83bb1f96
Treehugger Robot [Wed, 23 Sep 2020 20:31:05 +0000 (20:31 +0000)]
Merge "NameDB: Actually remove the address from requested addresses"
Hansong Zhang [Wed, 23 Sep 2020 20:21:26 +0000 (20:21 +0000)]
GATT: Put L2cap disconnect logic together am:
5e132b82be am:
21aae3372d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435005
Change-Id: Id01962a366ea7bfb9546fdf93e0ede64095109ba
Hansong Zhang [Wed, 23 Sep 2020 20:21:25 +0000 (20:21 +0000)]
SDP: Remove sdp_disconnect_cfm am:
9f00dd8605 am:
e14d7cefec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435004
Change-Id: Ie4e504e121d9c6cd2927dd6c4ad4c8399a66bb54
Hansong Zhang [Wed, 23 Sep 2020 20:21:23 +0000 (20:21 +0000)]
L2c_int: Remove unused function am:
5138be321b am:
3010d7b075
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435003
Change-Id: I6a19542f33285781523dc48f8b3f8abb8aed5b32
Hansong Zhang [Wed, 23 Sep 2020 20:21:19 +0000 (20:21 +0000)]
Send L2CA_DisconnectRsp from L2cap state machine am:
7886f18a7f am:
272768563f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434999
Change-Id: I436bcd58822808fe893833dbd61631491b50eef5
Hansong Zhang [Wed, 23 Sep 2020 20:20:24 +0000 (20:20 +0000)]
SDP_BROWSE_PLUS is never true am:
6065a41765 am:
f1f3bc62d5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434998
Change-Id: Ifbe76b71c6e6017a5023e163b9f5ef89e2258623
Hansong Zhang [Wed, 23 Sep 2020 20:06:09 +0000 (20:06 +0000)]
GATT: Put L2cap disconnect logic together am:
5e132b82be
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435005
Change-Id: I5c7fa8283caba83ff69b258cda1288cf7660d64b
Hansong Zhang [Wed, 23 Sep 2020 20:06:05 +0000 (20:06 +0000)]
SDP: Remove sdp_disconnect_cfm am:
9f00dd8605
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435004
Change-Id: I2476f18919adaaa94821a4d16fe4db8654fb8639
Hansong Zhang [Wed, 23 Sep 2020 20:06:03 +0000 (20:06 +0000)]
L2c_int: Remove unused function am:
5138be321b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435003
Change-Id: I83bccd0217710dc338b4632b6e3e35efdac59e14
Hansong Zhang [Wed, 23 Sep 2020 20:05:57 +0000 (20:05 +0000)]
Send L2CA_DisconnectRsp from L2cap state machine am:
7886f18a7f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434999
Change-Id: I99c710d60378359865ff1b9c585e0c4416a17ef4
Hansong Zhang [Wed, 23 Sep 2020 20:05:01 +0000 (20:05 +0000)]
SDP_BROWSE_PLUS is never true am:
6065a41765
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434998
Change-Id: I56019cf71ede4273996ef381f82fe4d77680eead
Hansong Zhang [Wed, 23 Sep 2020 04:54:33 +0000 (21:54 -0700)]
GATT: Put L2cap disconnect logic together
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ida76c6223bdcb61153aa0a422e8f47468a58c368
Hansong Zhang [Wed, 23 Sep 2020 04:37:08 +0000 (21:37 -0700)]
SDP: Remove sdp_disconnect_cfm
Just invoke the callbacks when we send disconnect request.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I734119e5aaaea05eeaf0d1d272865cf420d03862
Hansong Zhang [Wed, 23 Sep 2020 03:49:17 +0000 (20:49 -0700)]
L2c_int: Remove unused function
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifae9b801dda409671785f7f0be9b2f9cf8f3c53b
Hansong Zhang [Tue, 22 Sep 2020 23:46:48 +0000 (16:46 -0700)]
Send L2CA_DisconnectRsp from L2cap state machine
Instead of having client send it.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id27fa866aaa059dcc7302d5b8a871087d42547ed
Hansong Zhang [Tue, 22 Sep 2020 22:56:54 +0000 (15:56 -0700)]
SDP_BROWSE_PLUS is never true
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0a0a579320cb2e58d49e21826ce84e3198e1a5c9
Chris Manton [Wed, 23 Sep 2020 06:57:57 +0000 (06:57 +0000)]
Re-log stack/acl/btm_acl::btm_acl_created am:
305d1c935b am:
47449c4745
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434996
Change-Id: I7d871786b4f2c575caf1aee41a881f58548bcb91
Chris Manton [Wed, 23 Sep 2020 06:57:55 +0000 (06:57 +0000)]
Add types::BtTransportText am:
a1b578c2a4 am:
58ebe435c4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434995
Change-Id: Iae40affc5aba177ae6cba80825853b4a3da2c1f6
Chris Manton [Wed, 23 Sep 2020 06:57:54 +0000 (06:57 +0000)]
Add hci role text am:
68559b914b am:
4f6044ba47
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434994
Change-Id: Ifbfe4367b6910793ab7763960e30fa22683f0cca
Chris Manton [Wed, 23 Sep 2020 06:57:52 +0000 (06:57 +0000)]
enum-ify stack/include/hcidefs::HCI_ROLE_ am:
6677e573d7 am:
fffb91195b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434993
Change-Id: Ic9d0b1503db93b3f53a41a272df779d10a2e4eea
Chris Manton [Wed, 23 Sep 2020 06:57:49 +0000 (06:57 +0000)]
Re-Var stack/acl/btm_acl::btm_acl_created am:
437a21aede am:
c612c8948b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434992
Change-Id: I80ab22e6ecb7a6b12c3e5e6c4a52df0de2bcbc1f
Chris Manton [Wed, 23 Sep 2020 06:19:57 +0000 (06:19 +0000)]
Re-log stack/acl/btm_acl::btm_acl_created am:
305d1c935b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434996
Change-Id: Ib01216b8a8f12184c1dbf78f4b2e7ce6b94e7c13
Chris Manton [Wed, 23 Sep 2020 06:19:54 +0000 (06:19 +0000)]
Add types::BtTransportText am:
a1b578c2a4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434995
Change-Id: Id6dd74756ea761bc3d087ca86a392b5ec415726d
Chris Manton [Wed, 23 Sep 2020 06:19:50 +0000 (06:19 +0000)]
Add hci role text am:
68559b914b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434994
Change-Id: I43684652b65d73cdcc6b79e6c189f91fa7e1a134
Chris Manton [Wed, 23 Sep 2020 06:19:46 +0000 (06:19 +0000)]
enum-ify stack/include/hcidefs::HCI_ROLE_ am:
6677e573d7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434993
Change-Id: Ifede4816744fb3112c866a9c993d5357a5b66688
Chris Manton [Wed, 23 Sep 2020 06:18:58 +0000 (06:18 +0000)]
Re-Var stack/acl/btm_acl::btm_acl_created am:
437a21aede
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434992
Change-Id: I300dcd65515cdec1327ad401aa949734fa831f68
Treehugger Robot [Wed, 23 Sep 2020 04:13:37 +0000 (04:13 +0000)]
Merge "SDP: We always use basic mode" am:
863b2e30aa am:
eb2b9ed70c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434931
Change-Id: I41322c83179c2bca7cbbc1f32a6fcbf86a54e27e
Treehugger Robot [Wed, 23 Sep 2020 04:05:17 +0000 (04:05 +0000)]
Merge "SDP: We always use basic mode" am:
863b2e30aa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434931
Change-Id: I0dc4c19cb154df25a7ad46d3c2b6422ae0315925
Treehugger Robot [Wed, 23 Sep 2020 04:05:15 +0000 (04:05 +0000)]
Merge "[fuzzing] Add liblog dependency." am:
022b3c1461 am:
97c1f6a6b7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434997
Change-Id: Id7192326dda143e2ef972a54cda75e0adee6b0ea
Chris Manton [Tue, 22 Sep 2020 20:53:47 +0000 (13:53 -0700)]
Re-log stack/acl/btm_acl::btm_acl_created
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I43713ef1a4eb7dd4ad62865056e8f05c2455277d
Chris Manton [Sat, 19 Sep 2020 01:11:17 +0000 (18:11 -0700)]
Add types::BtTransportText
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I6fc84ef84a169f2a04b9aa7726206c58d8848021
Chris Manton [Mon, 21 Sep 2020 20:55:50 +0000 (13:55 -0700)]
Add hci role text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I713403023a53905821e39ad9a8251bab9a8779ca
Chris Manton [Sat, 19 Sep 2020 20:47:45 +0000 (13:47 -0700)]
enum-ify stack/include/hcidefs::HCI_ROLE_
Also add typed storage
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I7d7097e8ba92bd6035ba027df93a905274eaec27
Chris Manton [Tue, 22 Sep 2020 20:21:58 +0000 (13:21 -0700)]
Re-Var stack/acl/btm_acl::btm_acl_created
Because 'p' is a terrible variable name
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I78ef2c1051ba151dbe605114aa5c45097f29bcde
Treehugger Robot [Wed, 23 Sep 2020 03:47:51 +0000 (03:47 +0000)]
Merge "SDP: We always use basic mode"
Treehugger Robot [Wed, 23 Sep 2020 03:27:28 +0000 (03:27 +0000)]
Merge "[fuzzing] Add liblog dependency." am:
022b3c1461
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434997
Change-Id: I663aa958d1eef6c21c3f54b6558508015ade1d5a
Treehugger Robot [Wed, 23 Sep 2020 03:03:01 +0000 (03:03 +0000)]
Merge "[fuzzing] Add liblog dependency."
Mitch Phillips [Tue, 22 Sep 2020 20:44:23 +0000 (13:44 -0700)]
[fuzzing] Add liblog dependency.
Static dependencies don't carry transient dynamic dependencies to the
link line. We need to link liblog as it's a necessary dependency, and
this is revealed with a new toolchain update. For more info, see the
bug.
Tag: #refactor
Bug:
131771163
Test: gd/fuzz/run libosi_fuzz_list
Change-Id: I9404ef275cf1814ac4803d8478af46cd949cd8e7
Martin Brabham [Tue, 22 Sep 2020 00:17:25 +0000 (17:17 -0700)]
NameDB: Actually remove the address from requested addresses
When a ReadRemoteName is called, there is a single PendingRemoteNameRead
struct that is set. This contains the callback and handler. Once this
is set, you cannot set another. The initial problem is that in the
OnRemoteReadResponse we never remove it from an internal tracking map.
This map prevents us from making duplicate requests which is good, but
since it's never removed, we can only request one time.
This CL fixes that by removing it in the OnRemoteReadResponse.
Additionally, from an API standpoint we want to provide a functioning
API. If a caller requests a name read and provides a callback, then why
not just call their callback when we get the data instead of telling
them we can't meet their needs (which is untrue).
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I55e41905cde5146bcb06b39078a02aa9ed059ab3
Treehugger Robot [Tue, 22 Sep 2020 23:08:29 +0000 (23:08 +0000)]
Merge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ... am:
bd7291ad19 am:
090d096d84
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434260
Change-Id: I32bc4d31f4e1e814682d5137613549e57af73c19
Hansong Zhang [Tue, 22 Sep 2020 22:30:06 +0000 (15:30 -0700)]
SDP: We always use basic mode
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I841a432c39299eb28ef3c63d3af65204821735c6
Treehugger Robot [Tue, 22 Sep 2020 22:48:05 +0000 (22:48 +0000)]
Merge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ... am:
bd7291ad19
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1434260
Change-Id: I8f4112d16014be6d7756da9c898d519cd921f4ab
Treehugger Robot [Tue, 22 Sep 2020 22:27:50 +0000 (22:27 +0000)]
Merge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ...
* changes:
enum-ify stack/btm/btm_ble_int_types::tBTM_BLE_SEC_REQ_ACT
enumify tL2C_CB::tL2C_LCB::conn_update_mask
Remove unnecesary warning on expected parsing failure
Only read power mode on non-le links
Add helpers tL2C_CB::tL2C_LCB::tBT_TRANSPORT
Streamline stack/l2cap/l2c_link::l2c_link_check_power_mode
Internally link stack/l2cap/l2c_link::l2c_link_check_power_mode
Remove def stack/l2cap/l2c_link::L2C_LINK_CHECK_POWER_MODE
Slight cleanup stack/acl/btm_pm::BTM_SetSsrParams
Specialize data structures tBTM_PM_STATUS tBTM_PM_MODE
Jakub Pawlowski [Tue, 22 Sep 2020 21:41:55 +0000 (21:41 +0000)]
Merge "stack: Periodic advertising scanner implementation" am:
a842768eb8 am:
692111f292
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1353774
Change-Id: I5c02a59aac36935900abae9687e914d2ca16f985
Jakub Pawlowski [Tue, 22 Sep 2020 21:31:41 +0000 (21:31 +0000)]
Merge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev am:
a6d074922e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12628928
Change-Id: I2608dcb1c9c9031bacfaba1b715974d9f98c7391
Jakub Pawlowski [Tue, 22 Sep 2020 21:23:15 +0000 (21:23 +0000)]
Merge "stack: Periodic advertising scanner implementation" am:
a842768eb8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1353774
Change-Id: Ifa2344d78c59419db64f663dcb09ff473cd18689
Jakub Pawlowski [Tue, 22 Sep 2020 21:14:20 +0000 (21:14 +0000)]
Merge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev
Jakub Pawlowski [Tue, 22 Sep 2020 21:08:44 +0000 (21:08 +0000)]
Merge "stack: Periodic advertising scanner implementation"
Chris Manton [Fri, 18 Sep 2020 15:54:40 +0000 (08:54 -0700)]
enum-ify stack/btm/btm_ble_int_types::tBTM_BLE_SEC_REQ_ACT
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I05ccdb3e4b1b42810f77a4d6322606434a4b58c7
Chris Manton [Fri, 4 Sep 2020 01:42:14 +0000 (18:42 -0700)]
enumify tL2C_CB::tL2C_LCB::conn_update_mask
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I00065f6573074738be0860365038a73f8b587e2e
Chris Manton [Thu, 3 Sep 2020 21:08:58 +0000 (14:08 -0700)]
Remove unnecesary warning on expected parsing failure
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I2310c69cf6b40e494d9aa191da590a8ea89c7e16
Chris Manton [Thu, 3 Sep 2020 17:28:24 +0000 (10:28 -0700)]
Only read power mode on non-le links
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I8832601ee35a0054085917cf92c6f51ca7f5aa4c
Chris Manton [Thu, 3 Sep 2020 17:24:13 +0000 (10:24 -0700)]
Add helpers tL2C_CB::tL2C_LCB::tBT_TRANSPORT
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I55ec884b8fbff02337b02616ba56566c908aebf4
Chris Manton [Thu, 3 Sep 2020 17:20:16 +0000 (10:20 -0700)]
Streamline stack/l2cap/l2c_link::l2c_link_check_power_mode
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ie696eafbc080777850b71ac5fad846ffcfc2ec8c
Chris Manton [Thu, 3 Sep 2020 17:16:41 +0000 (10:16 -0700)]
Internally link stack/l2cap/l2c_link::l2c_link_check_power_mode
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: If653303d78db7ed0dea16ef6dfff1de7c2766d74
Chris Manton [Thu, 3 Sep 2020 17:14:30 +0000 (10:14 -0700)]
Remove def stack/l2cap/l2c_link::L2C_LINK_CHECK_POWER_MODE
Unnecessary layer of indirection
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I0e99b5df8fb0f2f678ae94320b1daaac78d606dd
Chris Manton [Thu, 3 Sep 2020 16:59:12 +0000 (09:59 -0700)]
Slight cleanup stack/acl/btm_pm::BTM_SetSsrParams
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I66a26522b52ffb15bbf38424ee0f06ab2daa1ef5
Chris Manton [Thu, 3 Sep 2020 16:04:58 +0000 (09:04 -0700)]
Specialize data structures tBTM_PM_STATUS tBTM_PM_MODE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I4868fd81c0a5c6c788382f0c81a4d908685642e6
Treehugger Robot [Tue, 22 Sep 2020 19:32:37 +0000 (19:32 +0000)]
Merge "Revert "HciHalTest: Handle EINTR when reading"" am:
2ba2de8ca1 am:
c64548e4ca
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1433884
Change-Id: I4f2fc0fc24c3bde812524ad2ccac50b578b3233f
Treehugger Robot [Tue, 22 Sep 2020 19:32:14 +0000 (19:32 +0000)]
Merge "GD-HCI: Add verbose logging for Tx and Rx packets" am:
1789721f4e am:
bc71fa5b28
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1433232
Change-Id: I96968f3513c9e553641e23739eebf1fe37844b08