OSDN Git Service

android-x86/system-bt.git
3 years agoAVRC uses the same mtu am: 0ae5bb34fd
Hansong Zhang [Fri, 25 Sep 2020 05:44:17 +0000 (05:44 +0000)]
AVRC uses the same mtu am: 0ae5bb34fd

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

Change-Id: Idbbacce00faeb0a1261093887a907ecba6f16f3a

3 years agoWe can't bypass FCS am: 9bc2e8608f
Hansong Zhang [Fri, 25 Sep 2020 05:44:00 +0000 (05:44 +0000)]
We can't bypass FCS am: 9bc2e8608f

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

Change-Id: I9fd3781e45446293fa51a0c76d21c34aae0ea146

3 years agop_ccb->bypass_fcs is never satisfied am: 772cf45701
Hansong Zhang [Fri, 25 Sep 2020 05:43:56 +0000 (05:43 +0000)]
p_ccb->bypass_fcs is never satisfied am: 772cf45701

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

Change-Id: I1f52a14411af18bc5df396dd9c5c18bc9f9fb598

3 years agoL2CAP: We never explicitly disable FCS am: be38658455
Hansong Zhang [Fri, 25 Sep 2020 05:43:01 +0000 (05:43 +0000)]
L2CAP: We never explicitly disable FCS am: be38658455

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

Change-Id: I84852d90b80d5da0066a200326e658782bf681ec

3 years agoMerge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c am: cd9e8dc741
Treehugger Robot [Fri, 25 Sep 2020 05:26:33 +0000 (05:26 +0000)]
Merge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c am: cd9e8dc741

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

Change-Id: I91b7c472cc8c6d82f59a708b16314fc66475c97c

3 years agoAVRC uses the same mtu
Hansong Zhang [Thu, 24 Sep 2020 20:12:22 +0000 (13:12 -0700)]
AVRC uses the same mtu

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

3 years agoWe can't bypass FCS
Hansong Zhang [Thu, 24 Sep 2020 03:40:13 +0000 (20:40 -0700)]
We can't bypass FCS

Note that in the case where the peer doesn't support FCS, we still send
FCS. This is an existing behavior and we keep it the same for now.

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

3 years agop_ccb->bypass_fcs is never satisfied
Hansong Zhang [Thu, 24 Sep 2020 03:32:50 +0000 (20:32 -0700)]
p_ccb->bypass_fcs is never satisfied

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

3 years agoL2CAP: We never explicitly disable FCS
Hansong Zhang [Thu, 24 Sep 2020 03:29:22 +0000 (20:29 -0700)]
L2CAP: We never explicitly disable FCS

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

3 years agoMerge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c
Treehugger Robot [Thu, 24 Sep 2020 21:53:33 +0000 (21:53 +0000)]
Merge changes Id7a14929,Ib01088d7,I3c46c8ec,Ib71ed35c

* changes:
  Add stack/include/avdt_api::peer_stream_endpoint_text
  Re-log btif/src/btif_sock_l2cap
  Add Api for tACL_CB::tACL_CONN::transport
  Complete hci errorcode text

3 years agoDirectHciTest: Accept more events am: aed10eff6e
Myles Watson [Thu, 24 Sep 2020 21:24:53 +0000 (21:24 +0000)]
DirectHciTest: Accept more events am: aed10eff6e

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

Change-Id: I72b797ecc1a053f70d0b001e927d98d7efef05c7

3 years agoAdd stack/include/avdt_api::peer_stream_endpoint_text
Chris Manton [Sat, 19 Sep 2020 20:55:33 +0000 (13:55 -0700)]
Add stack/include/avdt_api::peer_stream_endpoint_text

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Id7a14929d04cc1f63b4482f8a9fa47e79711a045

3 years agoRe-log btif/src/btif_sock_l2cap
Chris Manton [Sat, 19 Sep 2020 18:01:07 +0000 (11:01 -0700)]
Re-log btif/src/btif_sock_l2cap

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ib01088d73a5735b650216cd174208788adf9ba65

3 years agoAdd Api for tACL_CB::tACL_CONN::transport
Chris Manton [Sat, 19 Sep 2020 21:08:21 +0000 (14:08 -0700)]
Add Api for tACL_CB::tACL_CONN::transport

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I3c46c8ecf15a382e0234013626312d5c8cc3ecb2

3 years agoComplete hci errorcode text
Chris Manton [Thu, 24 Sep 2020 00:28:56 +0000 (17:28 -0700)]
Complete hci errorcode text

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ib71ed35ce4495db3a869cf6e7b52a9b815e46b58

3 years agoDirectHciTest: Accept more events
Myles Watson [Wed, 23 Sep 2020 13:19:43 +0000 (06:19 -0700)]
DirectHciTest: Accept more events

Test: cert/run --host
Bug: 145832107
Tag: #gd-refactor
Change-Id: I19fb16bea62ad444c67b33343bffd3c2cc85f6bd

3 years agoBNEP: Always use BNEP_MTU_SIZE as remote MTU size am: 6d23e9f28b
Hansong Zhang [Thu, 24 Sep 2020 07:15:36 +0000 (07:15 +0000)]
BNEP: Always use BNEP_MTU_SIZE as remote MTU size am: 6d23e9f28b

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

Change-Id: I64ac9f1e09952a1f0258ee0c39297a531ee1c141

3 years agoBNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE am: 4f72bc0ff3
Hansong Zhang [Thu, 24 Sep 2020 07:15:33 +0000 (07:15 +0000)]
BNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE am: 4f72bc0ff3

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

Change-Id: Ieb3c8aaddaf117c217d5ff3708ad051ed63f64f5

3 years agoSDP: FCR mode is checked in L2cap layer am: d581fc8a55
Hansong Zhang [Thu, 24 Sep 2020 07:14:46 +0000 (07:14 +0000)]
SDP: FCR mode is checked in L2cap layer am: d581fc8a55

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

Change-Id: I2f2c03bab369e962b79c842f5af8b7ad083e4c0c

3 years agoRemove already handled case am: 5a3ea66dff
Hansong Zhang [Thu, 24 Sep 2020 07:14:42 +0000 (07:14 +0000)]
Remove already handled case am: 5a3ea66dff

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

Change-Id: Iabe231a958cf615e9749e6fec8cdb4aae1f7dfbe

3 years agoL2CAP: Allowed mode is equivalent to preferred mode am: dea3f23a21
Hansong Zhang [Thu, 24 Sep 2020 07:14:38 +0000 (07:14 +0000)]
L2CAP: Allowed mode is equivalent to preferred mode am: dea3f23a21

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

Change-Id: I7f76425ad3b9e85fda85553e79cf37c7059ffb6e

3 years agoRemove L2CAP_FCR_STREAM_MODE related function am: 0784dff159
Hansong Zhang [Thu, 24 Sep 2020 07:13:53 +0000 (07:13 +0000)]
Remove L2CAP_FCR_STREAM_MODE related function am: 0784dff159

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

Change-Id: Ib16404d1689f07ffaf0e250839bed0018fcaa5f3

3 years agoL2CAP_FCR_STREAM_MODE is never used am: 186c7d13c8
Hansong Zhang [Thu, 24 Sep 2020 07:13:49 +0000 (07:13 +0000)]
L2CAP_FCR_STREAM_MODE is never used am: 186c7d13c8

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

Change-Id: I30a4cbba5077316784caac2fc9a8f404db855fdf

3 years agoAVCT_BR always uses L2CAP_FCR_ERTM_MODE am: b744aeeb13
Hansong Zhang [Thu, 24 Sep 2020 07:13:03 +0000 (07:13 +0000)]
AVCT_BR always uses L2CAP_FCR_ERTM_MODE am: b744aeeb13

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

Change-Id: I83a5cc94ebd794b50d83161208845a3aea69a71d

3 years agoL2cap: Store MTU and ERTM info during registration am: 11d4544b0a
Hansong Zhang [Thu, 24 Sep 2020 02:51:45 +0000 (02:51 +0000)]
L2cap: Store MTU and ERTM info during registration am: 11d4544b0a

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

Change-Id: I9ec6a43ec0965631081eaa89b22963649e1da7e5

3 years agoSDP_FLUSH_TO is always 0xFFFF (L2cap default) am: 88a4aac0cc
Hansong Zhang [Thu, 24 Sep 2020 02:51:42 +0000 (02:51 +0000)]
SDP_FLUSH_TO is always 0xFFFF (L2cap default) am: 88a4aac0cc

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

Change-Id: I20a6b8c6c3ca62b4d0dd4f132674f4e9b7b89d0a

3 years agoSDP: We always use basic mode am: 738ceb5df3
Hansong Zhang [Thu, 24 Sep 2020 02:51:38 +0000 (02:51 +0000)]
SDP: We always use basic mode am: 738ceb5df3

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

Change-Id: Ifc073a5040efbc9614edfdaab641b7706fb4fc91

3 years agoRFCOMM code minor clean up am: 4d9eeb522b
Hansong Zhang [Thu, 24 Sep 2020 02:51:03 +0000 (02:51 +0000)]
RFCOMM code minor clean up am: 4d9eeb522b

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

Change-Id: I4ab0e0efc9fe0eefcf2d44ec0f59ea4a50d07238

3 years agoBNEP: Always use BNEP_MTU_SIZE as remote MTU size
Hansong Zhang [Thu, 24 Sep 2020 02:19:35 +0000 (19:19 -0700)]
BNEP: Always use BNEP_MTU_SIZE as remote MTU size

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

3 years agoBNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE
Hansong Zhang [Thu, 24 Sep 2020 02:17:21 +0000 (19:17 -0700)]
BNEP_MIN_MTU_SIZE is the same as BNEP_MTU_SIZE

Just use one const.

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

3 years agoSDP: FCR mode is checked in L2cap layer
Hansong Zhang [Thu, 24 Sep 2020 00:35:10 +0000 (17:35 -0700)]
SDP: FCR mode is checked in L2cap layer

In l2c_fcr_process_peer_cfg_req.

L2cap layer sends config response for you.

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

3 years agoRemove already handled case
Hansong Zhang [Thu, 24 Sep 2020 00:29:34 +0000 (17:29 -0700)]
Remove already handled case

Handled in `p_cfg->fcr.mode == L2CAP_FCR_BASIC_MODE` case.

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

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

3 years agoRemove L2CAP_FCR_STREAM_MODE related function
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

3 years agoL2CAP_FCR_STREAM_MODE is never used
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

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

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

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

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

3 years agoRFCOMM code minor clean up
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

3 years agoMerge "RootCanal: Set event masks" am: aef2d91113
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

3 years agoMerge "RootCanal: Set event masks"
Treehugger Robot [Thu, 24 Sep 2020 00:43:51 +0000 (00:43 +0000)]
Merge "RootCanal: Set event masks"

3 years agoMerge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ... am: ff1b628212
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

3 years agoMerge changes I5fad5161,I7ce390ca,Ib0b4ea11,I6cc72e13,Ic4a66b2c, ...
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

3 years agoRootCanal: Set event masks
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

3 years agoSDP code clean up am: 9b7b90aabf
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

3 years agopL2CA_DisconnectCfm_Cb is unused am: b803f44d90
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

3 years agoHIDH: Move L2cap disconnect logic together am: ba20fb9716
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

3 years agoHIDD: Move L2cap disconnect logic together am: b69ff0c16c
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

3 years agoAVCT: Move L2cap disconnect logic together am: 99a0ebf3ec
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

3 years agoAVCT_BR: Move L2cap disconnect logic together am: 08c437d37c
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

3 years agoAVDT: Move L2cap disconnect logic together am: 75b25c50b6
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

3 years agoRemove unused parameter in avdt_ad_tc_close_ind am: 1510436dd6
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

3 years agoSDP code clean up
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

3 years agopL2CA_DisconnectCfm_Cb is unused
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

3 years agoHIDH: Move L2cap disconnect logic together
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

3 years agoHIDD: Move L2cap disconnect logic together
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

3 years agoAVCT: Move L2cap disconnect logic together
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

3 years agoAVCT_BR: Move L2cap disconnect logic together
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

3 years agoAVDT: Move L2cap disconnect logic together
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

3 years agoRemove unused parameter in avdt_ad_tc_close_ind
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

3 years agoRe-log bta/gatt::bta_gattc_conn_cback
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

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

3 years agoEliminate socket verbosity print_events()
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

3 years agoRe-log stack/acl::BTM_SwitchRole
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

3 years agoReduce identical APIs
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

3 years agoRemove #def code conditional BTM_MAX_SCO_LINKS
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

3 years agoRemove unused #defs stack/btm/btm_ble_int_types::
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

3 years agoInternally link stack/btm/btm_ble_gap::btm_send_hci_scan_enable
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

3 years agoUse new APIS stack/acl/btm_acl
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

3 years agoStreamline stack/acl/btm_acl::btm_acl_created
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

3 years agoAdd new APIS stack/acl/btm_acl
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

3 years agoMerge "NameDB: Actually remove the address from requested addresses" am: be6fa9814b
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

3 years agoMerge "NameDB: Actually remove the address from requested addresses"
Treehugger Robot [Wed, 23 Sep 2020 20:31:05 +0000 (20:31 +0000)]
Merge "NameDB: Actually remove the address from requested addresses"

3 years agoGATT: Put L2cap disconnect logic together am: 5e132b82be
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

3 years agoSDP: Remove sdp_disconnect_cfm am: 9f00dd8605
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

3 years agoL2c_int: Remove unused function am: 5138be321b
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

3 years agoSend L2CA_DisconnectRsp from L2cap state machine am: 7886f18a7f
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

3 years agoSDP_BROWSE_PLUS is never true am: 6065a41765
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

3 years agoGATT: Put L2cap disconnect logic together
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

3 years agoSDP: Remove sdp_disconnect_cfm
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

3 years agoL2c_int: Remove unused function
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

3 years agoSend L2CA_DisconnectRsp from L2cap state machine
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

3 years agoSDP_BROWSE_PLUS is never true
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

3 years agoRe-log stack/acl/btm_acl::btm_acl_created am: 305d1c935b
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

3 years agoAdd types::BtTransportText am: a1b578c2a4
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

3 years agoAdd hci role text am: 68559b914b
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

3 years agoenum-ify stack/include/hcidefs::HCI_ROLE_ am: 6677e573d7
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

3 years agoRe-Var stack/acl/btm_acl::btm_acl_created am: 437a21aede
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

3 years agoMerge "SDP: We always use basic mode" am: 863b2e30aa
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

3 years agoRe-log stack/acl/btm_acl::btm_acl_created
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

3 years agoAdd types::BtTransportText
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

3 years agoAdd hci role text
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

3 years agoenum-ify stack/include/hcidefs::HCI_ROLE_
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

3 years agoRe-Var stack/acl/btm_acl::btm_acl_created
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

3 years agoMerge "SDP: We always use basic mode"
Treehugger Robot [Wed, 23 Sep 2020 03:47:51 +0000 (03:47 +0000)]
Merge "SDP: We always use basic mode"

3 years agoMerge "[fuzzing] Add liblog dependency." am: 022b3c1461
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

3 years agoMerge "[fuzzing] Add liblog dependency."
Treehugger Robot [Wed, 23 Sep 2020 03:03:01 +0000 (03:03 +0000)]
Merge "[fuzzing] Add liblog dependency."

3 years ago[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

3 years agoNameDB: Actually remove the address from requested addresses
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