OSDN Git Service
Hansong Zhang [Thu, 24 Sep 2020 07:29:24 +0000 (07:29 +0000)]
BNEP: Always use BNEP_MTU_SIZE as remote MTU size am:
6d23e9f28b am:
b07dd570d1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436435
Change-Id: I56d3cfd78fafa3ebf718242e6dd140e53b6a3821
Hansong Zhang [Thu, 24 Sep 2020 07:29:22 +0000 (07:29 +0000)]
BNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE am:
4f72bc0ff3 am:
e5dd31c4e8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436434
Change-Id: I942daed1de73ef99ad958a4c60d77c288e353a62
Hansong Zhang [Thu, 24 Sep 2020 07:29:13 +0000 (07:29 +0000)]
SDP: FCR mode is checked in L2cap layer am:
d581fc8a55 am:
bda42151bb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435847
Change-Id: I6ea86e2c0045bca827aed10e0ae7ada559fd2087
Hansong Zhang [Thu, 24 Sep 2020 07:29:11 +0000 (07:29 +0000)]
Remove already handled case am:
5a3ea66dff am:
6261a08c7b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435846
Change-Id: Ia2c97f0948f08a6d7248587e14a4b1f5db8c4f37
Hansong Zhang [Thu, 24 Sep 2020 07:29:09 +0000 (07:29 +0000)]
L2CAP: Allowed mode is equivalent to preferred mode am:
dea3f23a21 am:
f82841c407
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435845
Change-Id: I3f924029b61a9b7a36b4b7ac2c38ad424dfce07e
Hansong Zhang [Thu, 24 Sep 2020 07:28:43 +0000 (07:28 +0000)]
Remove L2CAP_FCR_STREAM_MODE related function am:
0784dff159 am:
840076d554
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435844
Change-Id: If44bc574440faf176253d0c6016bb4553283ed74
Hansong Zhang [Thu, 24 Sep 2020 07:28:41 +0000 (07:28 +0000)]
L2CAP_FCR_STREAM_MODE is never used am:
186c7d13c8 am:
8f4fed02f0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435843
Change-Id: I868e85903aa78fad56a506a8a4327b73da1535a2
Hansong Zhang [Thu, 24 Sep 2020 07:28:38 +0000 (07:28 +0000)]
AVCT_BR always uses L2CAP_FCR_ERTM_MODE am:
b744aeeb13 am:
e18bf0b7d3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435842
Change-Id: I7386118d08f55c90d5e240b0499730037ae26bda
Hansong Zhang [Thu, 24 Sep 2020 07:15:36 +0000 (07:15 +0000)]
BNEP: Always use BNEP_MTU_SIZE as remote MTU size am:
6d23e9f28b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436435
Change-Id: I64ac9f1e09952a1f0258ee0c39297a531ee1c141
Hansong Zhang [Thu, 24 Sep 2020 07:15:33 +0000 (07:15 +0000)]
BNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE am:
4f72bc0ff3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436434
Change-Id: Ieb3c8aaddaf117c217d5ff3708ad051ed63f64f5
Hansong Zhang [Thu, 24 Sep 2020 07:14:46 +0000 (07:14 +0000)]
SDP: FCR mode is checked in L2cap layer am:
d581fc8a55
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435847
Change-Id: I2f2c03bab369e962b79c842f5af8b7ad083e4c0c
Hansong Zhang [Thu, 24 Sep 2020 07:14:42 +0000 (07:14 +0000)]
Remove already handled case am:
5a3ea66dff
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435846
Change-Id: Iabe231a958cf615e9749e6fec8cdb4aae1f7dfbe
Hansong Zhang [Thu, 24 Sep 2020 07:14:38 +0000 (07:14 +0000)]
L2CAP: Allowed mode is equivalent to preferred mode am:
dea3f23a21
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435845
Change-Id: I7f76425ad3b9e85fda85553e79cf37c7059ffb6e
Hansong Zhang [Thu, 24 Sep 2020 07:13:53 +0000 (07:13 +0000)]
Remove L2CAP_FCR_STREAM_MODE related function am:
0784dff159
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435844
Change-Id: Ib16404d1689f07ffaf0e250839bed0018fcaa5f3
Hansong Zhang [Thu, 24 Sep 2020 07:13:49 +0000 (07:13 +0000)]
L2CAP_FCR_STREAM_MODE is never used am:
186c7d13c8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435843
Change-Id: I30a4cbba5077316784caac2fc9a8f404db855fdf
Hansong Zhang [Thu, 24 Sep 2020 07:13:03 +0000 (07:13 +0000)]
AVCT_BR always uses L2CAP_FCR_ERTM_MODE am:
b744aeeb13
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435842
Change-Id: I83a5cc94ebd794b50d83161208845a3aea69a71d
Hansong Zhang [Thu, 24 Sep 2020 03:25:28 +0000 (03:25 +0000)]
L2cap: Store MTU and ERTM info during registration am:
11d4544b0a am:
ef37c2c9f6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435841
Change-Id: I2726a51f7a5cd30fd50af4efd83203acc5b892c2
Hansong Zhang [Thu, 24 Sep 2020 03:25:26 +0000 (03:25 +0000)]
SDP_FLUSH_TO is always 0xFFFF (L2cap default) am:
88a4aac0cc am:
19164f1809
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435840
Change-Id: I08ad421fe4fc7553f0e5c19ca67ca6b991a094a1
Hansong Zhang [Thu, 24 Sep 2020 03:25:25 +0000 (03:25 +0000)]
SDP: We always use basic mode am:
738ceb5df3 am:
d733b3ada8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435839
Change-Id: I789d47d46df02a722a6483f55292bc6da94fa12b
Hansong Zhang [Thu, 24 Sep 2020 03:25:22 +0000 (03:25 +0000)]
RFCOMM code minor clean up am:
4d9eeb522b am:
09bbc3fa56
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435838
Change-Id: I4533f25b4ac874dcd3bae72bce37781d790b3ee2
Hansong Zhang [Thu, 24 Sep 2020 02:51:45 +0000 (02:51 +0000)]
L2cap: Store MTU and ERTM info during registration am:
11d4544b0a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435841
Change-Id: I9ec6a43ec0965631081eaa89b22963649e1da7e5
Hansong Zhang [Thu, 24 Sep 2020 02:51:42 +0000 (02:51 +0000)]
SDP_FLUSH_TO is always 0xFFFF (L2cap default) am:
88a4aac0cc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435840
Change-Id: I20a6b8c6c3ca62b4d0dd4f132674f4e9b7b89d0a
Hansong Zhang [Thu, 24 Sep 2020 02:51:38 +0000 (02:51 +0000)]
SDP: We always use basic mode am:
738ceb5df3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435839
Change-Id: Ifc073a5040efbc9614edfdaab641b7706fb4fc91
Hansong Zhang [Thu, 24 Sep 2020 02:51:03 +0000 (02:51 +0000)]
RFCOMM code minor clean up am:
4d9eeb522b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435838
Change-Id: I4ab0e0efc9fe0eefcf2d44ec0f59ea4a50d07238
Hansong Zhang [Thu, 24 Sep 2020 02:19:35 +0000 (19:19 -0700)]
BNEP: Always use BNEP_MTU_SIZE as remote MTU size
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4462455539f1801b3b9960e822caa56b25699ed6
Hansong Zhang [Thu, 24 Sep 2020 02:17:21 +0000 (19:17 -0700)]
BNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE
Just use one const.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib7239f21ea4f3270268d0c206b695150097cff7f
Hansong Zhang [Thu, 24 Sep 2020 00:35:10 +0000 (17:35 -0700)]
SDP: FCR mode is checked in L2cap layer
In l2c_fcr_process_peer_cfg_req.
L2cap layer sends config response for you.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I841c8f23c15004cd6aade3b2ce8803cf4dd88909
Hansong Zhang [Thu, 24 Sep 2020 00:29:34 +0000 (17:29 -0700)]
Remove already handled case
Handled in `p_cfg->fcr.mode == L2CAP_FCR_BASIC_MODE` case.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I08cd4d60930ab0bc9bd49e0242c27facec1d4fc5
Hansong Zhang [Thu, 24 Sep 2020 00:25:39 +0000 (17:25 -0700)]
L2CAP: Allowed mode is equivalent to preferred mode
In all use cases, we want one BASIC or ERTM exculsively, but we never
allow "both are ok" mode.
Remove allowed_mode. Use preferred_mode to denote the desired mode.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I846eca1912fc9ea04dfa57c5698039d62e634186
Hansong Zhang [Wed, 23 Sep 2020 23:55:23 +0000 (16:55 -0700)]
Remove L2CAP_FCR_STREAM_MODE related function
We never enter this mode.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I604b507b0b703561f4e56240296c3cc46cfcb700
Hansong Zhang [Wed, 23 Sep 2020 23:54:05 +0000 (16:54 -0700)]
L2CAP_FCR_STREAM_MODE is never used
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ieababd683bb4379b67b3da540c190624a81ef89c
Hansong Zhang [Wed, 23 Sep 2020 23:51:40 +0000 (16:51 -0700)]
AVCT_BR always uses L2CAP_FCR_ERTM_MODE
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I97f3c5cba1595202c62909f505bf5a23520ae293
Hansong Zhang [Wed, 23 Sep 2020 22:38:40 +0000 (15:38 -0700)]
L2cap: Store MTU and ERTM info during registration
So that L2cap can auto respond to config req/rsp.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8b68bd2d0e200a5dae9936ab46a259442987f219
Hansong Zhang [Wed, 23 Sep 2020 22:14:14 +0000 (15:14 -0700)]
SDP_FLUSH_TO is always 0xFFFF (L2cap default)
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I47ea25194816a9aebf64c2e7eea3ff329cd3624e
Hansong Zhang [Wed, 23 Sep 2020 22:12:42 +0000 (15:12 -0700)]
SDP: We always use basic mode
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9510a361a5aaf4a85c25a548f7501efe4c9221d5
Hansong Zhang [Wed, 23 Sep 2020 22:12:06 +0000 (15:12 -0700)]
RFCOMM code minor clean up
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia9b0bda9187577201a3face014a03a53950a7cce
Treehugger Robot [Thu, 24 Sep 2020 00:58:21 +0000 (00:58 +0000)]
Merge "RootCanal: Set event masks" am:
aef2d91113 am:
67bf2e33b7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436372
Change-Id: Id34036de80eee531f5902d03001f28ee8fa075ff
Treehugger Robot [Thu, 24 Sep 2020 00:58:10 +0000 (00:58 +0000)]
Merge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ... am:
ff1b628212 am:
ff98a4915a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435762
Change-Id: I8b8eddece7c10bc6455e1bfa88f582b5a3e40c60
Treehugger Robot [Thu, 24 Sep 2020 00:48:46 +0000 (00:48 +0000)]
Merge "RootCanal: Set event masks" am:
aef2d91113
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1436372
Change-Id: If3384b220c93396d024b026f550cf1e0c6e1c069
Treehugger Robot [Thu, 24 Sep 2020 00:43:51 +0000 (00:43 +0000)]
Merge "RootCanal: Set event masks"
Treehugger Robot [Thu, 24 Sep 2020 00:40:20 +0000 (00:40 +0000)]
Merge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ... am:
ff1b628212
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435762
Change-Id: Icc8fb89c3d59f962dc3d9bbe23e0808e57554508
Treehugger Robot [Wed, 23 Sep 2020 23:48:50 +0000 (23:48 +0000)]
Merge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ...
* changes:
Re-log bta/gatt::bta_gattc_conn_cback
Re-include btif/src/btif_sock_l2cap
Eliminate socket verbosity print_events()
Re-log stack/acl::BTM_SwitchRole
Reduce identical APIs
Remove #def code conditional BTM_MAX_SCO_LINKS
Remove unused #defs stack/btm/btm_ble_int_types::
Internally link stack/btm/btm_ble_gap::btm_send_hci_scan_enable
Use new APIS stack/acl/btm_acl
Streamline stack/acl/btm_acl::btm_acl_created
Add new APIS stack/acl/btm_acl
Myles Watson [Wed, 23 Sep 2020 13:24:55 +0000 (06:24 -0700)]
RootCanal: Set event masks
Test: cert/run --host
Bug:
145832107
Tag: #gd-refactor
Change-Id: Ie8b63828c2d774852682c0ff6888150d9ee524fc
Hansong Zhang [Wed, 23 Sep 2020 22:33:27 +0000 (22:33 +0000)]
SDP code clean up am:
9b7b90aabf am:
027614ac01
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435157
Change-Id: I96fa4073b020c3625fe9a7a764f633d331bf0a1f
Hansong Zhang [Wed, 23 Sep 2020 22:33:25 +0000 (22:33 +0000)]
pL2CA_DisconnectCfm_Cb is unused am:
b803f44d90 am:
6480ed0415
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435156
Change-Id: I62cb8f42f672f8c61a5424d59eb7eb70949e549b
Hansong Zhang [Wed, 23 Sep 2020 22:33:23 +0000 (22:33 +0000)]
HIDH: Move L2cap disconnect logic together am:
ba20fb9716 am:
b669795777
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435155
Change-Id: Ic05639b6645d79bc9627a1145eaf273a600bd11b
Hansong Zhang [Wed, 23 Sep 2020 22:33:21 +0000 (22:33 +0000)]
HIDD: Move L2cap disconnect logic together am:
b69ff0c16c am:
25f2ef478d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435154
Change-Id: I3e431c9b5db8da2235bb41d427f6adeba402773c
Hansong Zhang [Wed, 23 Sep 2020 22:33:19 +0000 (22:33 +0000)]
AVCT: Move L2cap disconnect logic together am:
99a0ebf3ec am:
2d2db9925d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435153
Change-Id: I45dd969a41631b68d8d100026f8b02bba0835404
Hansong Zhang [Wed, 23 Sep 2020 22:33:17 +0000 (22:33 +0000)]
AVCT_BR: Move L2cap disconnect logic together am:
08c437d37c am:
13363d059e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435152
Change-Id: Icb2d60c760780856cb661a4eb283cd87f2dc9e21
Hansong Zhang [Wed, 23 Sep 2020 22:33:15 +0000 (22:33 +0000)]
AVDT: Move L2cap disconnect logic together am:
75b25c50b6 am:
cfb683ff01
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1435007
Change-Id: Ib571b61cf7eda3bb36ff6f7dcc70347b7e094c66
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