OSDN Git Service
Hansong Zhang [Fri, 25 Sep 2020 23:37:05 +0000 (16:37 -0700)]
Use bnep_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ieb28a7bbdea106a5e51e9bf996ecba9dab71f15a
Hansong Zhang [Fri, 25 Sep 2020 23:29:29 +0000 (16:29 -0700)]
Simplify sdp_on_l2cap_error
Both cases are doing the same thing (send disconnect request is no-op if
channel is not open, and then free the control block).
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9b29899164b00fd9072e4dc37cfc30dd095c3524
Hansong Zhang [Fri, 25 Sep 2020 23:27:47 +0000 (16:27 -0700)]
SDP failure reason isn't used
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1ee477914c1f13f43f868a28f18b372e36baf752
Hansong Zhang [Fri, 25 Sep 2020 23:24:52 +0000 (16:24 -0700)]
SDP: Move L2cap error handling to one place
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I903127f07ae97349d1fa7625d20835b46dbe9063
Hansong Zhang [Fri, 25 Sep 2020 23:16:48 +0000 (16:16 -0700)]
Remove unused code in l2c_api
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifdcb0a14919e75103796246cddb9011393e0035a
Hansong Zhang [Fri, 25 Sep 2020 22:32:40 +0000 (15:32 -0700)]
Remove L2CA_ErtmConnectRsp
Just use L2CA_ConnectRsp.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie95ed09c9d2e79fabd9d6eae6a038a6896a8e558
Hansong Zhang [Fri, 25 Sep 2020 22:27:51 +0000 (15:27 -0700)]
Remove L2CA_ErtmConnectReq
Now that the p_ertm_info parameter is unused, just use L2CA_ConnectReq.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I458e0d8bcc2809c8bc2d295be29516be05bf05ba
Hansong Zhang [Fri, 25 Sep 2020 22:18:09 +0000 (15:18 -0700)]
L2CAP: Use ERTM info during registration, not conn req
ERTM info is stored in p_ccb->p_rcb. Use that as the source of truth.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I78c3d65fdaf14addf80607ce5105221e52447a9e
Hansong Zhang [Fri, 25 Sep 2020 21:57:49 +0000 (14:57 -0700)]
Clean up unused defines and imports
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5c47ee320085664b3db68ff4a5860aa931d1376d
Hansong Zhang [Fri, 25 Sep 2020 21:32:11 +0000 (14:32 -0700)]
L2cap user: Use ConfigCfm_Cb as channel open indicator
When the user receives ConfigCfm_Cb, it's guaranteed that ConfigInd_Cb
is received with correct option enforced.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6de12f1ba6e9612f6a84b399e7fc984a7f3c3c72
Hansong Zhang [Fri, 25 Sep 2020 20:24:55 +0000 (13:24 -0700)]
L2C_CSM: Send ConfigCfm to user after ConfigInd
This way, users know that a ConfigCfm event with status OK means channel
is established. No need to further keep track of state.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I90295349c53d57aa859c5bb65e6f28a299714b3d
Hansong Zhang [Fri, 25 Sep 2020 19:39:16 +0000 (12:39 -0700)]
L2CA_ConfigCfm_Cb only need to provide result
Users only care about result.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ife07db2454f938fb1dd1b7fde2136b8de887fa3b
Hansong Zhang [Fri, 25 Sep 2020 19:17:12 +0000 (12:17 -0700)]
HIDD: Treat unacceptable QOS as normal failure
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7d37c46f7c6b16a55afafe04b62081d43f63c122
Hansong Zhang [Fri, 25 Sep 2020 18:31:02 +0000 (11:31 -0700)]
L2CA_ConfigReq and L2CA_ConfigRsp are internal now
Only used by l2c_csm, so we make an internal version instead.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If725c705bcbabec025cb16d063cd4d4aa4b319f9
Hansong Zhang [Fri, 25 Sep 2020 18:15:00 +0000 (11:15 -0700)]
Remove L2CA_ConfigReq in client code
Let L2CAP do this for you.
HIDD used to send anothe ConfigReq if the remote HIDH wants a different
QOS. We drop this adjustment for now. QOS is not used. Regard this as a
normal config error. This simplifies the workflow.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic3ff08a4b876462fec697ffa8a09fc8bca943603
Hansong Zhang [Fri, 25 Sep 2020 04:32:08 +0000 (21:32 -0700)]
L2CAP module will send ConfigReq for you
No need to send it in client code.
Will get rid of the fake L2CA_ConfigReq() next.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I66e2efad144e76eb6abfa6d421e12ae4a60d8e1f
Hansong Zhang [Fri, 25 Sep 2020 07:04:44 +0000 (00:04 -0700)]
L2CAP: Don't allow sending re-config
There is no use case. Remove the support for now. This makes L2CAP state
machine more complicated.
Note that we don't handle re-config request from remote gracefully. For
example, RFCOMM will simply disconnect.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1d2a420e4f904b7e935715f327171d133760eab3
Hansong Zhang [Fri, 25 Sep 2020 06:28:56 +0000 (23:28 -0700)]
L2CA_ConfigRsp is always invoked with status OK
So we can move some error processing logic.
Also we never send a config with continuation flag.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6c5e05b39a76138f90b41a0e56b7bfd73f056455
Hansong Zhang [Fri, 25 Sep 2020 04:20:37 +0000 (21:20 -0700)]
L2CAP: Provide a default ERTM option
Note that the existing ERTM options for AVCT_BR and GAP OBEX are almost
the same, and the only difference is TxWindow (10 and 20). Providing a
default value of 10 won't make a difference.
Use the same ERTM option so that later L2CAP can send config request for
them.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I410045f47c643fd4a152ae44722e905b2ce01197
Hansong Zhang [Fri, 25 Sep 2020 03:59:13 +0000 (20:59 -0700)]
Some ERTM values are constant
Remove unnecessary definition.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2cb74575a57262e11ebc389a3f9473702dbb13b4
Hansong Zhang [Fri, 25 Sep 2020 03:45:11 +0000 (20:45 -0700)]
Remove unnecessary definition
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9baf600d22cad78b2b93d29dd7d8975731beb47d
Treehugger Robot [Sat, 26 Sep 2020 00:51:46 +0000 (00:51 +0000)]
Merge "HciCaptures: Add CommandComplete"
Myles Watson [Thu, 24 Sep 2020 15:51:14 +0000 (08:51 -0700)]
HciCaptures: Add CommandComplete
Add public methods to match or extract events in matchers.py.
Call the same private static methods to extract or match events.
- CommandComplete
- LeMetaEvent
- LeConnectionComplete
Test: cert/run --host
Bug:
145832107
Tag: #gd-refactor
Change-Id: I308e97cfe60dbcd351f211ff836c0516019412db
Hansong Zhang [Fri, 25 Sep 2020 03:05:07 +0000 (20:05 -0700)]
Let L2CAP send ConfigRsp for you
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4767af7032b9c22fc297cca0877a1bc7e8c8607b
Chris Manton [Fri, 25 Sep 2020 00:11:21 +0000 (17:11 -0700)]
Straighten out stack/acl/btm_acl::btm_read_remote_version_complete
Towards readable code
Bug:
163134718
Tag: #refactor
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I87db6ce0106e98684f1582a60f28beed81d66aec
Chris Manton [Fri, 25 Sep 2020 05:12:00 +0000 (22:12 -0700)]
Add gd/l2cap::OnReadRemoteVersionInformationComplete
Provide ability to handle at higher layer
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I717b273623df4a3e21bf07e62b034cd7ad790cd3
Treehugger Robot [Fri, 25 Sep 2020 19:15:18 +0000 (19:15 +0000)]
Merge "Handle remote connection parameter request"
Jakub Pawlowski [Fri, 25 Sep 2020 17:28:07 +0000 (19:28 +0200)]
Handle remote connection parameter request
Bug:
145832107
Test: connect with LE Device that request parameter chagne
Tag: #gd-refactor
Change-Id: I82839b56c58dda4b2f430c212156bf8919d67103
Hansong Zhang [Fri, 25 Sep 2020 02:57:01 +0000 (19:57 -0700)]
Enforce remote MTU requirement in L2CAP directly
AVCT_BR and BNEP don't need to enforce it locally.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I090d4e31b76e0098fc77e707ebd2eacf4cd78b7b
Hansong Zhang [Fri, 25 Sep 2020 02:28:17 +0000 (19:28 -0700)]
L2CAP: peer_cfg_bits is unused
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Icec4e536f28a649779f747d34a7d76295f5ef10f
Hansong Zhang [Fri, 25 Sep 2020 00:50:55 +0000 (17:50 -0700)]
L2CAP: Add a "required_remote_mtu" and store it
For AVCT_BR and BNEP, we need a larger required remote mtu than minimal
L2CAP MTU.
So far we enforce this in profile service itself, but later we can let
L2CAP module enforce this for us.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0b4bad4049636bcdc52615c000b1fff3acde360c
Hansong Zhang [Fri, 25 Sep 2020 00:27:49 +0000 (17:27 -0700)]
Remove unused code in BNEP
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I51a6edb1d7f94422657128d0b3d8398a4c25c5de
Hansong Zhang [Thu, 24 Sep 2020 23:56:10 +0000 (16:56 -0700)]
Profile services have const MTU size now
For GAP, the value comes from
`btsock_l2cap_listen_or_connect`. For classic dynamic channel, we use
L2CAP_SDU_LENGTH_MAX for now.
For GATT, we use GATT_MAX_MTU_SIZE, which was used when we send
config request.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I93b82c718866f09c4c209311c93b65f2dc74b193
Treehugger Robot [Fri, 25 Sep 2020 15:14:56 +0000 (15:14 +0000)]
Merge changes I8b3c9cd4,Iedb0a81a,If7612988,I25f7c702,I23eb6baa, ...
* changes:
Move decls to ble_hci interface
Locally link and remove unused funcs stack/btm/btm_ble_privacy
Remove duplicate decls stack/btm/btm_ble_int
Move function decls with usage stack/btm::
Explictly provide ble extern declarations
Move stack/btm/btm_ble_addr::btm_ble_refresh_raddr_timer_timeout
Chris Manton [Sun, 20 Sep 2020 00:54:59 +0000 (17:54 -0700)]
Move decls to ble_hci interface
From: stack/btm/btm_ble_int
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I8b3c9cd43fe3cc34a2c41c53252d5f58990b2dbf
Jakub Pawlowski [Fri, 25 Sep 2020 09:12:13 +0000 (09:12 +0000)]
Merge "Properly pass address type when extended advertisement is received"
Chris Manton [Sun, 20 Sep 2020 01:22:09 +0000 (18:22 -0700)]
Locally link and remove unused funcs stack/btm/btm_ble_privacy
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Iedb0a81a01f7c1ac24bc35202be32b9799e2e4e4
Chris Manton [Sun, 20 Sep 2020 00:41:57 +0000 (17:41 -0700)]
Remove duplicate decls stack/btm/btm_ble_int
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: If7612988717edca3d2676635783fbff331552268
Chris Manton [Sun, 20 Sep 2020 00:38:17 +0000 (17:38 -0700)]
Move function decls with usage stack/btm::
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I25f7c7024c29ac461d4f50db365fb28d97f5f407
Chris Manton [Sun, 20 Sep 2020 01:00:52 +0000 (18:00 -0700)]
Explictly provide ble extern declarations
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I23eb6baa71324529a413f20614dc9e4e8ab8bc70
Chris Manton [Sun, 20 Sep 2020 00:22:05 +0000 (17:22 -0700)]
Move stack/btm/btm_ble_addr::btm_ble_refresh_raddr_timer_timeout
From: stack/btm/btm_ble_gap::btm_ble_refresh_raddr_timer_timeout
Group functionality within same file
Towards readable code
Bug:
163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ida81c42548b377ecada80bfe7e94f0e4fa45721a
HsingYuan Lo [Fri, 25 Sep 2020 04:04:19 +0000 (04:04 +0000)]
Merge "Expose service changed event to application (1/3)"
Hansong Zhang [Thu, 24 Sep 2020 23:45:19 +0000 (16:45 -0700)]
AVDTP: Use the same MTU in config request
MTU in config request indicates how many bytes _we_ can process at most.
Instead of using different number for signalling and audio channel, we
use the same number, which is the greater one . This won't require the
remote side to have a larger buffer size, as they can still send the
same packet size as before. We won't need to worry about memory
implication either, because audio buffer will go away quickly.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iab025784699a77d89d784926d1f393a3cc2fe767
Hansong Zhang [Thu, 24 Sep 2020 23:19:19 +0000 (16:19 -0700)]
Remove unused definition in benp_int
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id2ba9e6366a2561249ee844b45a118d219d96b16
Hansong Zhang [Thu, 24 Sep 2020 23:16:33 +0000 (16:16 -0700)]
We always send default flush timeout
When we send out config request, we always use flush timeout 0xffff
(infinity), which is the default value.
We don't need to include this value in config request.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic06f1e7e39ccbce2ec85c6126d30e179d5971837
Hansong Zhang [Thu, 24 Sep 2020 22:50:07 +0000 (15:50 -0700)]
AVDT Flush Timeout is fixed
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6f85b8bda7dc92310a7c474fa016c5f507cb4e96
Hansong Zhang [Thu, 24 Sep 2020 22:15:18 +0000 (15:15 -0700)]
AVDT MTU is fixed
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iad9e204602f643a820c982e46d24539b4595f84f
Hansong Zhang [Thu, 24 Sep 2020 20:33:56 +0000 (13:33 -0700)]
AVRC_BR uses the same mtu
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4a22ec350f1feff0c443dd411e223f6a58a5b282
Hansong Zhang [Thu, 24 Sep 2020 20:16:11 +0000 (13:16 -0700)]
AVRC uses the same mtu (part 2)
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie7e5be1bd0b1c94aac122aedf3ee05dac45e386e
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
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
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
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
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
Jakub Pawlowski [Thu, 24 Sep 2020 19:33:16 +0000 (21:33 +0200)]
Properly pass address type when extended advertisement is received
Tag: #gd-refactor
Bug:
139080884
Change-Id: If55ccd7998c6239ffaa0f02468a5314aa759f4ef
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
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
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
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
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
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:43:51 +0000 (00:43 +0000)]
Merge "RootCanal: Set event masks"
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 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
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:31:05 +0000 (20:31 +0000)]
Merge "NameDB: Actually remove the address from requested addresses"
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