git.osdn.net Git - android-x86/system-bt.git/log

Hansong Zhang [Sat, 26 Sep 2020 23:36:07 +0000 (23:36 +0000)]

Use gatt_on_l2cap_error for error handling am: e8dc945f4d am: 1ff9532d2b am: 75d0f3e73c

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

Change-Id: I47b8b1c337a8585b99808e8105c5bf5f2e07ad57

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:36:05 +0000 (23:36 +0000)]

Simplify bnep_on_l2cap_error am: 3b18048449 am: 4ec67658f4 am: 89c00cdc09

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

Change-Id: Ie148cea33df431ba11e9f5c62aed763d509565e8

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:36:03 +0000 (23:36 +0000)]

Use bnep_on_l2cap_error for error handling am: 44b477a8bc am: cb2dd251df am: c30c230d53

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

Change-Id: Ibca8d7de765255d324d120720a86b91e675b04d6

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:36:01 +0000 (23:36 +0000)]

Simplify sdp_on_l2cap_error am: c86dcd3704 am: fc9c30fb8f am: daceeaebcb

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

Change-Id: Ia98d362d4986f404d4242159d72fb55e4f577713

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:35:59 +0000 (23:35 +0000)]

SDP failure reason isn't used am: bd04c8dcd3 am: 2a521b89ae am: 38867d3ff7

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

Change-Id: If6d8a0ff72f60ff393ae6d18b055c5c383f0d165

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:35:57 +0000 (23:35 +0000)]

SDP: Move L2cap error handling to one place am: ceac9ce032 am: 81acebad6f am: 490a3305f8

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

Change-Id: Ibff7da84397331efa02452405dcc8aa16c23adf8

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:35:55 +0000 (23:35 +0000)]

Remove unused code in l2c_api am: 3fd840f421 am: beea7302e3 am: a8947cfdc0

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

Change-Id: If916de0aa21f9ea7923c0124a2b28754cbcc1a68

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:35:52 +0000 (23:35 +0000)]

Remove L2CA_ErtmConnectRsp am: 11e328e0d4 am: f848c43b58 am: b9970a895f

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

Change-Id: I9c5aa12790ed37f7631d72c0cdb0e3bf313861fc

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:13:01 +0000 (23:13 +0000)]

Use gatt_on_l2cap_error for error handling am: e8dc945f4d am: 1ff9532d2b

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

Change-Id: I170ddb81f2220ef1ccc2dc0eb2f7b7da9abd5773

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:12:58 +0000 (23:12 +0000)]

Simplify bnep_on_l2cap_error am: 3b18048449 am: 4ec67658f4

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

Change-Id: Ide68451b3fbb948d53ba58512c4b0def75652490

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:12:56 +0000 (23:12 +0000)]

Use bnep_on_l2cap_error for error handling am: 44b477a8bc am: cb2dd251df

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

Change-Id: If1b91a9fd15b4e1cc7fda5fdcfce16f6ced0eea3

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:12:55 +0000 (23:12 +0000)]

Simplify sdp_on_l2cap_error am: c86dcd3704 am: fc9c30fb8f

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

Change-Id: I72e2f24594f21f87c21f7526a0408239c4b91366

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:12:53 +0000 (23:12 +0000)]

SDP failure reason isn't used am: bd04c8dcd3 am: 2a521b89ae

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

Change-Id: Ia4654f15a0d23a86efddaacba04d99568f01bc2e

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:12:51 +0000 (23:12 +0000)]

SDP: Move L2cap error handling to one place am: ceac9ce032 am: 81acebad6f

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

Change-Id: I8b28894954480fa4d19d6659fe0b9dd059f15b83

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 22:48:00 +0000 (22:48 +0000)]

Use gatt_on_l2cap_error for error handling am: e8dc945f4d

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

Change-Id: If3d908794800893809af613fbf2e8074801eaa71

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 22:47:56 +0000 (22:47 +0000)]

Simplify bnep_on_l2cap_error am: 3b18048449

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

Change-Id: Id3c875a660cbfcb4ee6ced2bb9ff295246e717b9

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 22:47:51 +0000 (22:47 +0000)]

Use bnep_on_l2cap_error for error handling am: 44b477a8bc

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

Change-Id: I802e48ec1b85f25fab4b78fffd694b1eb04f7f46

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 22:47:48 +0000 (22:47 +0000)]

Simplify sdp_on_l2cap_error am: c86dcd3704

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

Change-Id: Ic1e19306b0ecb910bd748253c4942a2d27747c1c

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 22:47:43 +0000 (22:47 +0000)]

SDP failure reason isn't used am: bd04c8dcd3

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

Change-Id: Icd7308889c4a0539d0dfec6dafe4331565ce3817

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 22:47:38 +0000 (22:47 +0000)]

SDP: Move L2cap error handling to one place am: ceac9ce032

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

Change-Id: I3b3da3e0744c427ab6cd59aef7e6cd369cf5c755

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 06:33:51 +0000 (06:33 +0000)]

Remove L2CA_ErtmConnectReq am: 415e2e80ff am: f85d6033f4 am: 370a428031

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

Change-Id: I5945f22c9cbc8d2edc219efd8e02899b0503b79f

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 06:33:48 +0000 (06:33 +0000)]

L2CAP: Use ERTM info during registration, not conn req am: 1877084886 am: bb9c4fa0f2 am: 82b456b611

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

Change-Id: I2ab3e07c27151bf5c305b924c47ec9480975716e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:06:10 +0000 (02:06 +0000)]

Clean up unused defines and imports am: f1ed22df09 am: 11c9073097 am: 5d45c835a9

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

Change-Id: I17339574cd7739c902d41d35d800696c329ec262

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:06:07 +0000 (02:06 +0000)]

L2cap user: Use ConfigCfm_Cb as channel open indicator am: 2304c36e52 am: 3edbe3c427 am: ee2d84453a

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

Change-Id: Id4786687719780039046fe899d334e4bcbe4914c

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:06:05 +0000 (02:06 +0000)]

L2C_CSM: Send ConfigCfm to user after ConfigInd am: 4bac7e4a78 am: 4e5d878fe8 am: 1f8aad563d

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

Change-Id: I9d2bd86803e8d89f66436d151911035e20f1c82a

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:06:03 +0000 (02:06 +0000)]

L2CA_ConfigCfm_Cb only need to provide result am: da8ec43139 am: f3201c3c3b am: d43a372ea1

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

Change-Id: I927a9669a88571b5703aa34d6050d6cef624996e

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:06:01 +0000 (02:06 +0000)]

HIDD: Treat unacceptable QOS as normal failure am: 3c87d00189 am: e5c650c227 am: 5408f2b0a0

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

Change-Id: Ib7772060b761300918e94cf6989a4d418fc738c5

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:05:59 +0000 (02:05 +0000)]

L2CA_ConfigReq and L2CA_ConfigRsp are internal now am: acc416288e am: 469629acc2 am: 1307fb2c29

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

Change-Id: I4940b267ee600c96fddac6f9a3651fee2f9610b5

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:05:56 +0000 (02:05 +0000)]

Remove L2CA_ConfigReq in client code am: e91542d478 am: 55776d6d6a am: 3a25e6f191

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

Change-Id: Ieff026ab0a1fe29a7973e65c967113b991985850

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:05:54 +0000 (02:05 +0000)]

L2CAP module will send ConfigReq for you am: 65acfa23cf am: f1d3cdc3b3 am: eece7ed233

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

Change-Id: Idc934e20fafaf34286afc42c418b44d112632d4a

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:05:52 +0000 (02:05 +0000)]

L2CAP: Don't allow sending re-config am: db34984d29 am: ad09212a89 am: 5e79a656a6

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

Change-Id: I02be8d38ef4655aacd00765809214d802b005237

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:05:50 +0000 (02:05 +0000)]

L2CA_ConfigRsp is always invoked with status OK am: 8588d5cdd1 am: ee1e17e709 am: e0f9245a6e

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

Change-Id: I3112348010962af900fda2b57250432f21d7e5ab

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:05:48 +0000 (02:05 +0000)]

L2CAP: Provide a default ERTM option am: 0640f93856 am: 6721ca6f6d am: 400e714348

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

Change-Id: I8c9497a19bccf10a241849a80da8824204ba7cb0

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:05:46 +0000 (02:05 +0000)]

Some ERTM values are constant am: 1b6d60e504 am: 75af19b15d am: 6530b3fb3b

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

Change-Id: Ib3e9b7d83e3385c84889374aa83023fe99bf843c

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 02:05:44 +0000 (02:05 +0000)]

Remove unnecessary definition am: 989e83b5c1 am: d675b7bc07 am: b3bc9f139e

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

Change-Id: I178140967bccdd9e449b684c98de5027047c3b67

commit | commitdiff | tree

Treehugger Robot [Sat, 26 Sep 2020 02:05:04 +0000 (02:05 +0000)]

Merge "HciCaptures: Add CommandComplete" am: 08fd1d6421 am: 38ec6d219a am: 889ebc516b

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

Change-Id: Ic45fa8b52fbe7d3bf77d650f33339f079e511ffd

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Fri, 25 Sep 2020 23:54:05 +0000 (16:54 -0700)]

Use gatt_on_l2cap_error for error handling

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

commit | commitdiff | tree

Hansong Zhang [Fri, 25 Sep 2020 23:37:51 +0000 (16:37 -0700)]

Simplify bnep_on_l2cap_error

Both cases are doing the same thing.

Error reason isn't used throughout the stack.

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Sat, 26 Sep 2020 00:51:46 +0000 (00:51 +0000)]

Merge "HciCaptures: Add CommandComplete"

commit | commitdiff | tree

Hansong Zhang [Fri, 25 Sep 2020 23:30:12 +0000 (23:30 +0000)]

Let L2CAP send ConfigRsp for you am: 75d1c63ba5 am: c00171736f am: d880e5cd3b

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

Change-Id: I36b85161a66682e7978e978d6a0282e9e223c27e

commit | commitdiff | tree

Chris Manton [Fri, 25 Sep 2020 23:30:06 +0000 (23:30 +0000)]

Straighten out stack/acl/btm_acl::btm_read_remote_version_complete am: d64f464405 am: dce4e2f847 am: f9a719c6bb

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

Change-Id: I7b3e7b850258fc3250471fb53365bd315adec14c

commit | commitdiff | tree

Chris Manton [Fri, 25 Sep 2020 23:30:01 +0000 (23:30 +0000)]

Add gd/l2cap::OnReadRemoteVersionInformationComplete am: 11131aa71b am: cd50f3afcf am: 43189eee19

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

Change-Id: I53054f8682aac94c986029eeba89e7113d7319f3

commit | commitdiff | tree

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