OSDN Git Service

android-x86/system-bt.git
3 years agoRemove unused code in l2c_api am: 3fd840f421 am: beea7302e3
Hansong Zhang [Sat, 26 Sep 2020 23:12:49 +0000 (23:12 +0000)]
Remove unused code in l2c_api am: 3fd840f421 am: beea7302e3

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

Change-Id: I7ff99c20c82950b6fe96712bfbe0c3f6dbd3bd54

3 years agoRemove L2CA_ErtmConnectRsp am: 11e328e0d4 am: f848c43b58
Hansong Zhang [Sat, 26 Sep 2020 23:12:45 +0000 (23:12 +0000)]
Remove L2CA_ErtmConnectRsp am: 11e328e0d4 am: f848c43b58

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

Change-Id: Ic69891015dc69f28b874e12e775c43b4a79442ef

3 years agoRemove unused code in l2c_api am: 3fd840f421
Hansong Zhang [Sat, 26 Sep 2020 22:47:34 +0000 (22:47 +0000)]
Remove unused code in l2c_api am: 3fd840f421

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

Change-Id: Ife055cc136ed77f80a45feb0193d10db676a5c44

3 years agoRemove L2CA_ErtmConnectRsp am: 11e328e0d4
Hansong Zhang [Sat, 26 Sep 2020 22:46:46 +0000 (22:46 +0000)]
Remove L2CA_ErtmConnectRsp am: 11e328e0d4

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

Change-Id: I34423e5fddcd4364baee29219edfafea54dcd9eb

3 years agoRemove L2CA_ErtmConnectReq am: 415e2e80ff am: f85d6033f4
Hansong Zhang [Sat, 26 Sep 2020 06:22:17 +0000 (06:22 +0000)]
Remove L2CA_ErtmConnectReq am: 415e2e80ff am: f85d6033f4

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

Change-Id: I95dc17d47f42794b627e8be04fd8ae1bbb29743b

3 years agoL2CAP: Use ERTM info during registration, not conn req am: 1877084886 am: bb9c4fa0f2
Hansong Zhang [Sat, 26 Sep 2020 06:22:13 +0000 (06:22 +0000)]
L2CAP: Use ERTM info during registration, not conn req am: 1877084886 am: bb9c4fa0f2

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

Change-Id: I391d8a2688af0b7ce3a99a174eed8fa8dd92097e

3 years agoRemove L2CA_ErtmConnectReq am: 415e2e80ff
Hansong Zhang [Sat, 26 Sep 2020 05:51:13 +0000 (05:51 +0000)]
Remove L2CA_ErtmConnectReq am: 415e2e80ff

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

Change-Id: Ifb146de6d763c881c42b47e813b7c31d22d5a835

3 years agoL2CAP: Use ERTM info during registration, not conn req am: 1877084886
Hansong Zhang [Sat, 26 Sep 2020 05:50:27 +0000 (05:50 +0000)]
L2CAP: Use ERTM info during registration, not conn req am: 1877084886

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

Change-Id: I5985b42406af81a0dd00737fec8882b86898cb84

3 years agoClean up unused defines and imports am: f1ed22df09 am: 11c9073097
Hansong Zhang [Sat, 26 Sep 2020 01:41:37 +0000 (01:41 +0000)]
Clean up unused defines and imports am: f1ed22df09 am: 11c9073097

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

Change-Id: I2a8c6e1d5b5715e82e8540543370f5d698548cea

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

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

Change-Id: I74854e4a4587e7c12f03a5d919b9b84692f2c22b

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

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

Change-Id: I46888c527760a6f7dcaab6714ca3f7cd297e67d8

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

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

Change-Id: I4f05c1135157c3f5945dfa5e68b3e5f8c204534d

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

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

Change-Id: I7a5f7bf0451ce3f9b875cd90b8240a98c183d7a1

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

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

Change-Id: Idfaf325b7d4ef9de3369ebcd7dc1c0c4b8ea3871

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

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

Change-Id: I798ab375e33ad2ba4dca3c2d006898314ceee523

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

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

Change-Id: I5775f7e30de43213ff13a783e235b572749c1a78

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

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

Change-Id: Ica13009f4be10e74ddfb74e3177b1529f7c167a2

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

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

Change-Id: I6a9f1a308b44f8f15f17e80628b58551e31e8707

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

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

Change-Id: I130ad57b81589add56b042d507c16c6a2a2f3981

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

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

Change-Id: I150d26e8c52f2f56749a7ec59dc0586dc5aa366d

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

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

Change-Id: Ia9b0091b3c17991b3f8df23fc6deeaf2b62f947d

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

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

Change-Id: Iac9663d9cb401b260bbdef9dd1edcc38f32c5c9a

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 agoRemove unused code in l2c_api
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

3 years agoRemove L2CA_ErtmConnectRsp
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

3 years agoRemove L2CA_ErtmConnectReq
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

3 years agoL2CAP: Use ERTM info during registration, not conn req
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

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 am: c00171736f
Hansong Zhang [Fri, 25 Sep 2020 23:14:36 +0000 (23:14 +0000)]
Let L2CAP send ConfigRsp for you am: 75d1c63ba5 am: c00171736f

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

Change-Id: I2872c55f5637ea68e85c1d01aa3ebc68bded0f15

3 years agoStraighten out stack/acl/btm_acl::btm_read_remote_version_complete am: d64f464405...
Chris Manton [Fri, 25 Sep 2020 23:14:21 +0000 (23:14 +0000)]
Straighten out stack/acl/btm_acl::btm_read_remote_version_complete am: d64f464405 am: dce4e2f847

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

Change-Id: I21a1003225894781a9fc338b9e099ee216381977

3 years agoAdd gd/l2cap::OnReadRemoteVersionInformationComplete am: 11131aa71b am: cd50f3afcf
Chris Manton [Fri, 25 Sep 2020 23:14:19 +0000 (23:14 +0000)]
Add gd/l2cap::OnReadRemoteVersionInformationComplete am: 11131aa71b am: cd50f3afcf

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

Change-Id: I63c96c495e362e433dcb7b3c35915cba77a3924d

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 am: f6f9561687
Treehugger Robot [Fri, 25 Sep 2020 19:51:10 +0000 (19:51 +0000)]
Merge "Handle remote connection parameter request" am: 827c2217e9 am: f6f9561687

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

Change-Id: I15bc4a7c7a3c835ed5521f5dd3dd647f2b4d742e

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

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

Change-Id: Ifec682a469df78de30d58917e26b370973d499d2

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

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

Change-Id: I5b03052f9dfba76068b0b4a10902baea564a3c2b

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

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

Change-Id: Ia70490add3ee2794a6502a5fbe0331f869fe0ab6

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

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

Change-Id: I637409054e4689a90a1132fcb98e9e418af25ba5

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

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

Change-Id: Ifc88585026028f862bcd378c7090d043b574c3d3

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 16:17:26 +0000 (16:17 +0000)]
Merge changes I8b3c9cd4,Iedb0a81a,If7612988,I25f7c702,I23eb6baa, ... am: 1cb3744fa9 am: 30e8505d80

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

Change-Id: Ieb2ac7b8c0c81730ffafa9d0fdf39be5af6993fc

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: 55b44a...
Jakub Pawlowski [Fri, 25 Sep 2020 09:59:48 +0000 (09:59 +0000)]
Merge "Properly pass address type when extended advertisement is received" am: 55b44afafd am: 18638ddba3

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

Change-Id: I7342213b2b1e33974ac3a3e9dc5746030c60284d

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 am: cf3be7220d
HsingYuan Lo [Fri, 25 Sep 2020 06:01:11 +0000 (06:01 +0000)]
Merge "Expose service changed event to application (1/3)" am: b87849b7b1 am: cf3be7220d

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

Change-Id: I65e3fac22e76fd2263acbaaa52b5be7a62b61a9a

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 am: 4f611c2569
Hansong Zhang [Fri, 25 Sep 2020 05:47:25 +0000 (05:47 +0000)]
AVDTP: Use the same MTU in config request am: 1780e37a0b am: 4f611c2569

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

Change-Id: Ia699cc19a4c756a00b1ec73a9ceaf561b9fa31cd

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

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

Change-Id: If6086f58be6a6bc22a0e6370586dda382caf5a83

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

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

Change-Id: I81657696d4bfab394c91c1c922472622c2c326d3

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

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

Change-Id: Iddf79c9341bb093c4a4eb845d48447a78f373cce

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

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

Change-Id: I9a24466b9867a676b5fb4d2754b8eb07b3914854

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

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

Change-Id: If482a10ffc4d2784f060979a6f0c7859ddb17d88

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

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

Change-Id: I2c7e28af065d988265d4ab449cf4b64bebf43532

3 years agoAVRC uses the same mtu am: 0ae5bb34fd am: c4d63071f4
Hansong Zhang [Fri, 25 Sep 2020 05:46:59 +0000 (05:46 +0000)]
AVRC uses the same mtu am: 0ae5bb34fd am: c4d63071f4

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

Change-Id: Ia30f5648b42541fe10c79fff94c0d0852c4cc199