OSDN Git Service

android-x86/system-bt.git
3 years agoClean up unused defines and imports am: f1ed22df09
Hansong Zhang [Sat, 26 Sep 2020 01:20:51 +0000 (01:20 +0000)]
Clean up unused defines and imports am: f1ed22df09

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

Change-Id: I27bd6dc4a030a76d2b0a196eeb749505f23dfdef

3 years agoL2cap user: Use ConfigCfm_Cb as channel open indicator am: 2304c36e52
Hansong Zhang [Sat, 26 Sep 2020 01:20:48 +0000 (01:20 +0000)]
L2cap user: Use ConfigCfm_Cb as channel open indicator am: 2304c36e52

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

Change-Id: I1ee0509fb3773e0c74a2ea27e40b7172909b2972

3 years agoL2C_CSM: Send ConfigCfm to user after ConfigInd am: 4bac7e4a78
Hansong Zhang [Sat, 26 Sep 2020 01:20:44 +0000 (01:20 +0000)]
L2C_CSM: Send ConfigCfm to user after ConfigInd am: 4bac7e4a78

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

Change-Id: Ie274e249a4865bcbe8cb3a8b52f2ec9dc6139c38

3 years agoL2CA_ConfigCfm_Cb only need to provide result am: da8ec43139
Hansong Zhang [Sat, 26 Sep 2020 01:20:40 +0000 (01:20 +0000)]
L2CA_ConfigCfm_Cb only need to provide result am: da8ec43139

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

Change-Id: Ie88ef37e16467bd8809df2ca44d710fc56a775fc

3 years agoHIDD: Treat unacceptable QOS as normal failure am: 3c87d00189
Hansong Zhang [Sat, 26 Sep 2020 01:20:36 +0000 (01:20 +0000)]
HIDD: Treat unacceptable QOS as normal failure am: 3c87d00189

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

Change-Id: Ib50488e6972f13614ac9fa352032213221650a62

3 years agoL2CA_ConfigReq and L2CA_ConfigRsp are internal now am: acc416288e
Hansong Zhang [Sat, 26 Sep 2020 01:20:31 +0000 (01:20 +0000)]
L2CA_ConfigReq and L2CA_ConfigRsp are internal now am: acc416288e

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

Change-Id: I0cbd5d725f6053d051f35b1e40c98fe6883a25c5

3 years agoRemove L2CA_ConfigReq in client code am: e91542d478
Hansong Zhang [Sat, 26 Sep 2020 01:20:27 +0000 (01:20 +0000)]
Remove L2CA_ConfigReq in client code am: e91542d478

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

Change-Id: I68652917693600c85d10e10574c5f4f64d7c51f6

3 years agoL2CAP module will send ConfigReq for you am: 65acfa23cf
Hansong Zhang [Sat, 26 Sep 2020 01:20:24 +0000 (01:20 +0000)]
L2CAP module will send ConfigReq for you am: 65acfa23cf

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

Change-Id: I4ea5f0e86c2bf834b348f7f3750517f0fed4550f

3 years agoL2CAP: Don't allow sending re-config am: db34984d29
Hansong Zhang [Sat, 26 Sep 2020 01:20:20 +0000 (01:20 +0000)]
L2CAP: Don't allow sending re-config am: db34984d29

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

Change-Id: If31d05d271340f2dd41561a4bc7142f223b9927b

3 years agoL2CA_ConfigRsp is always invoked with status OK am: 8588d5cdd1
Hansong Zhang [Sat, 26 Sep 2020 01:20:15 +0000 (01:20 +0000)]
L2CA_ConfigRsp is always invoked with status OK am: 8588d5cdd1

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

Change-Id: I593f15a4d4157df2a7109c2c43d74559a7cbabd8

3 years agoL2CAP: Provide a default ERTM option am: 0640f93856
Hansong Zhang [Sat, 26 Sep 2020 01:20:12 +0000 (01:20 +0000)]
L2CAP: Provide a default ERTM option am: 0640f93856

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

Change-Id: I18acbf65f5eab682de8073b98875f828da5056fa

3 years agoSome ERTM values are constant am: 1b6d60e504
Hansong Zhang [Sat, 26 Sep 2020 01:20:07 +0000 (01:20 +0000)]
Some ERTM values are constant am: 1b6d60e504

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

Change-Id: I0803905600edcfd0c0012d51917c584815ef87d8

3 years agoRemove unnecessary definition am: 989e83b5c1
Hansong Zhang [Sat, 26 Sep 2020 01:20:03 +0000 (01:20 +0000)]
Remove unnecessary definition am: 989e83b5c1

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

Change-Id: I82073c462fe23457dc86e2cb3580de5da844b8d0

3 years agoMerge "HciCaptures: Add CommandComplete" am: 08fd1d6421
Treehugger Robot [Sat, 26 Sep 2020 01:19:01 +0000 (01:19 +0000)]
Merge "HciCaptures: Add CommandComplete" am: 08fd1d6421

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

Change-Id: Idc051f11ee5ccf06d7b241fb5dc66261ae34bc0f

3 years agoClean up unused defines and imports
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

3 years agoL2cap user: Use ConfigCfm_Cb as channel open indicator
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

3 years agoL2C_CSM: Send ConfigCfm to user after ConfigInd
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

3 years agoL2CA_ConfigCfm_Cb only need to provide result
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

3 years agoHIDD: Treat unacceptable QOS as normal failure
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

3 years agoL2CA_ConfigReq and L2CA_ConfigRsp are internal now
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

3 years agoRemove L2CA_ConfigReq in client code
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

3 years agoL2CAP module will send ConfigReq for you
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

3 years agoL2CAP: Don't allow sending re-config
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

3 years agoL2CA_ConfigRsp is always invoked with status OK
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

3 years agoL2CAP: Provide a default ERTM option
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

3 years agoSome ERTM values are constant
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

3 years agoRemove unnecessary definition
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

3 years agoMerge "HciCaptures: Add CommandComplete"
Treehugger Robot [Sat, 26 Sep 2020 00:51:46 +0000 (00:51 +0000)]
Merge "HciCaptures: Add CommandComplete"

3 years agoLet L2CAP send ConfigRsp for you am: 75d1c63ba5
Hansong Zhang [Fri, 25 Sep 2020 22:55:30 +0000 (22:55 +0000)]
Let L2CAP send ConfigRsp for you am: 75d1c63ba5

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

Change-Id: I18cd60e397d3d74dbf2827918010b08e443b2f7d

3 years agoHciCaptures: 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

3 years agoStraighten out stack/acl/btm_acl::btm_read_remote_version_complete am: d64f464405
Chris Manton [Fri, 25 Sep 2020 22:43:09 +0000 (22:43 +0000)]
Straighten out stack/acl/btm_acl::btm_read_remote_version_complete am: d64f464405

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

Change-Id: I39a09c44ed84df9c6f4d5c076d0b7fc171813b35

3 years agoAdd gd/l2cap::OnReadRemoteVersionInformationComplete am: 11131aa71b
Chris Manton [Fri, 25 Sep 2020 22:42:24 +0000 (22:42 +0000)]
Add gd/l2cap::OnReadRemoteVersionInformationComplete am: 11131aa71b

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

Change-Id: Ie02d5e1824a37937b7b4e8b08dd94738d9ec11b7

3 years agoLet L2CAP send ConfigRsp for you
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

3 years agoStraighten out stack/acl/btm_acl::btm_read_remote_version_complete
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

3 years agoAdd gd/l2cap::OnReadRemoteVersionInformationComplete
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

3 years agoMerge "Handle remote connection parameter request" am: 827c2217e9
Treehugger Robot [Fri, 25 Sep 2020 19:19:43 +0000 (19:19 +0000)]
Merge "Handle remote connection parameter request" am: 827c2217e9

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

Change-Id: I49d07ef7d59d9b312b01caaa1a17944d77d60212

3 years agoEnforce remote MTU requirement in L2CAP directly am: 679dfc5152
Hansong Zhang [Fri, 25 Sep 2020 19:19:29 +0000 (19:19 +0000)]
Enforce remote MTU requirement in L2CAP directly am: 679dfc5152

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

Change-Id: I54ee513e88222c2119ecc89ef45eb3ad389f912b

3 years agoL2CAP: peer_cfg_bits is unused am: b0d9b4b9b7
Hansong Zhang [Fri, 25 Sep 2020 19:19:25 +0000 (19:19 +0000)]
L2CAP: peer_cfg_bits is unused am: b0d9b4b9b7

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

Change-Id: Ib6ce3a945650bbb9fe1a92d60b92c1f44406c06a

3 years agoL2CAP: Add a "required_remote_mtu" and store it am: 8ddee4d822
Hansong Zhang [Fri, 25 Sep 2020 19:19:21 +0000 (19:19 +0000)]
L2CAP: Add a "required_remote_mtu" and store it am: 8ddee4d822

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

Change-Id: I1b184c4b93e50339d346cfd635a36c007ed944c3

3 years agoRemove unused code in BNEP am: bf88eeb9ea
Hansong Zhang [Fri, 25 Sep 2020 19:19:18 +0000 (19:19 +0000)]
Remove unused code in BNEP am: bf88eeb9ea

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

Change-Id: Ied8c5cccc4da6f559095f9f37ae127d9445d7a53

3 years agoProfile services have const MTU size now am: 2e15c539cc
Hansong Zhang [Fri, 25 Sep 2020 19:17:59 +0000 (19:17 +0000)]
Profile services have const MTU size now am: 2e15c539cc

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

Change-Id: Ie2fde010c0631b54cc9c8199cb7c91e5bced60cc

3 years agoMerge "Handle remote connection parameter request"
Treehugger Robot [Fri, 25 Sep 2020 19:15:18 +0000 (19:15 +0000)]
Merge "Handle remote connection parameter request"

3 years agoHandle 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

3 years agoEnforce remote MTU requirement in L2CAP directly
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

3 years agoL2CAP: peer_cfg_bits is unused
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

3 years agoL2CAP: Add a "required_remote_mtu" and store it
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

3 years agoRemove unused code in BNEP
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

3 years agoProfile services have const MTU size now
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

3 years agoMerge changes I8b3c9cd4,Iedb0a81a,If7612988,I25f7c702,I23eb6baa, ... am: 1cb3744fa9
Treehugger Robot [Fri, 25 Sep 2020 15:40:13 +0000 (15:40 +0000)]
Merge changes I8b3c9cd4,Iedb0a81a,If7612988,I25f7c702,I23eb6baa, ... am: 1cb3744fa9

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

Change-Id: I0820a5e1990b2bc8b0dffe87b213212c4c3a602c

3 years agoMerge changes I8b3c9cd4,Iedb0a81a,If7612988,I25f7c702,I23eb6baa, ...
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

3 years agoMove decls to ble_hci interface
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

3 years agoMerge "Properly pass address type when extended advertisement is received" am: 55b44afafd
Jakub Pawlowski [Fri, 25 Sep 2020 09:31:19 +0000 (09:31 +0000)]
Merge "Properly pass address type when extended advertisement is received" am: 55b44afafd

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

Change-Id: Iac4fc6bc3c4a14b398c1545e3ae49e40cc095017

3 years agoMerge "Properly pass address type when extended advertisement is received"
Jakub Pawlowski [Fri, 25 Sep 2020 09:12:13 +0000 (09:12 +0000)]
Merge "Properly pass address type when extended advertisement is received"

3 years agoMerge "Expose service changed event to application (1/3)" am: b87849b7b1
HsingYuan Lo [Fri, 25 Sep 2020 05:51:49 +0000 (05:51 +0000)]
Merge "Expose service changed event to application (1/3)" am: b87849b7b1

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

Change-Id: If50a9798d140cccaa54f29009cea94afeb991a95

3 years agoAVDTP: Use the same MTU in config request am: 1780e37a0b
Hansong Zhang [Fri, 25 Sep 2020 05:45:02 +0000 (05:45 +0000)]
AVDTP: Use the same MTU in config request am: 1780e37a0b

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

Change-Id: I5e3014b2451932a8fde734b13ad840171437835b

3 years agoRemove unused definition in benp_int am: cac61e8f34
Hansong Zhang [Fri, 25 Sep 2020 05:44:58 +0000 (05:44 +0000)]
Remove unused definition in benp_int am: cac61e8f34

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

Change-Id: Ibd1f295a4b10b602044bd4708c8cf74527a81294

3 years agoWe always send default flush timeout am: 31903b6da7
Hansong Zhang [Fri, 25 Sep 2020 05:44:48 +0000 (05:44 +0000)]
We always send default flush timeout am: 31903b6da7

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

Change-Id: I66644495f589ca8a4a6a9db849018ce21b58102f

3 years agoAVDT Flush Timeout is fixed am: 655234d56e
Hansong Zhang [Fri, 25 Sep 2020 05:44:45 +0000 (05:44 +0000)]
AVDT Flush Timeout is fixed am: 655234d56e

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

Change-Id: Ia4026c0439007a1dd54bcf26bbc5814446b5adae

3 years agoAVDT MTU is fixed am: 94722f9372
Hansong Zhang [Fri, 25 Sep 2020 05:44:41 +0000 (05:44 +0000)]
AVDT MTU is fixed am: 94722f9372

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

Change-Id: Ib7dd455bf705071c82f31e3ebb51aa0b26ef047d

3 years agoAVRC_BR uses the same mtu am: 810f878b5a
Hansong Zhang [Fri, 25 Sep 2020 05:44:30 +0000 (05:44 +0000)]
AVRC_BR uses the same mtu am: 810f878b5a

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

Change-Id: Ia81def4d5e9f6026267a6629a415cf7e4482992c

3 years agoAVRC uses the same mtu (part 2) am: 6e25c080da
Hansong Zhang [Fri, 25 Sep 2020 05:44:22 +0000 (05:44 +0000)]
AVRC uses the same mtu (part 2) am: 6e25c080da

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

Change-Id: I99d3b36e97f06f5f5c0dc60800af0cb09e9d1cf8

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 agoLocally link and remove unused funcs stack/btm/btm_ble_privacy
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

3 years agoRemove duplicate decls stack/btm/btm_ble_int
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

3 years agoMove function decls with usage stack/btm::
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

3 years agoExplictly provide ble extern declarations
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

3 years agoMove stack/btm/btm_ble_addr::btm_ble_refresh_raddr_timer_timeout
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

3 years agoMerge "Expose service changed event to application (1/3)"
HsingYuan Lo [Fri, 25 Sep 2020 04:04:19 +0000 (04:04 +0000)]
Merge "Expose service changed event to application (1/3)"

3 years agoAVDTP: Use the same MTU in config request
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

3 years agoRemove unused definition in benp_int
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

3 years agoWe always send default flush timeout
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

3 years agoAVDT Flush Timeout is fixed
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

3 years agoAVDT MTU is fixed
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

3 years agoAVRC_BR uses the same mtu
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

3 years agoAVRC uses the same mtu (part 2)
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

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 agoProperly pass address type when extended advertisement is received
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

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