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

(root) / android-x86 / system-bt.git / log

Hansong Zhang [Tue, 29 Sep 2020 03:50:11 +0000 (03:50 +0000)]

GAP_ConnOpen code minor clean up am: 21632e0b62 am: ba209a3226 am: 7fae33bc2a

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

Change-Id: I185732d0779628ad1499928d253c05e1a351fa02

commit | commitdiff | tree

Hansong Zhang [Tue, 29 Sep 2020 03:50:09 +0000 (03:50 +0000)]

LE COC: Indicate channel open on ConnectRsp recv am: 6613113056 am: 3761a6e954 am: d4bce0bbe0

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

Change-Id: Id63108f8160300883a9c2c0d73ed8eae8dfa3409

commit | commitdiff | tree

Hansong Zhang [Tue, 29 Sep 2020 03:37:23 +0000 (03:37 +0000)]

GAP_ConnOpen code minor clean up am: 21632e0b62 am: ba209a3226

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

Change-Id: I8a48f4a37e859a14611daa3f6b43116d0b3b6704

commit | commitdiff | tree

Hansong Zhang [Tue, 29 Sep 2020 03:37:19 +0000 (03:37 +0000)]

LE COC: Indicate channel open on ConnectRsp recv am: 6613113056 am: 3761a6e954

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

Change-Id: Ic815acb594d8b9ce89ed7ce42fa7ae4392bfaf74

commit | commitdiff | tree

Hansong Zhang [Tue, 29 Sep 2020 03:14:56 +0000 (03:14 +0000)]

GAP_ConnOpen code minor clean up am: 21632e0b62

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

Change-Id: Ie66737d784407cb87c200c9786d00c0ccbf6730a

commit | commitdiff | tree

Hansong Zhang [Tue, 29 Sep 2020 03:14:16 +0000 (03:14 +0000)]

LE COC: Indicate channel open on ConnectRsp recv am: 6613113056

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

Change-Id: I81c978939c6bf1bd34b1218db58140696a76b0d4

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 01:32:40 +0000 (01:32 +0000)]

Merge "Call EXPECT_CALL before the incoming event" am: e4bfe75a30 am: cd9aa2e6c3 am: 8ac1d04461

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

Change-Id: Ice45e20d9e811076c0f6b9cbb197b22b3e84c7ce

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 01:32:33 +0000 (01:32 +0000)]

Merge "SM: Implement name request during Classic pairing" am: d165f580d1 am: c89db9cc3f am: e49bc93563

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

Change-Id: I16c44eac86e9f63567ba3aaddaca96303a85853e

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 01:09:55 +0000 (01:09 +0000)]

Merge "Call EXPECT_CALL before the incoming event" am: e4bfe75a30 am: cd9aa2e6c3

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

Change-Id: I46934f3c297005b19a59e6a52097b6ec50e3379b

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 01:09:49 +0000 (01:09 +0000)]

Merge "SM: Implement name request during Classic pairing" am: d165f580d1 am: c89db9cc3f

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

Change-Id: I365ccc65919fda56d7e2b2b4cc1464d0166d4b11

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:38:47 +0000 (15:38 -0700)]

GAP_ConnOpen code minor clean up

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

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:15:10 +0000 (13:15 -0700)]

LE COC: Indicate channel open on ConnectRsp recv

Also don't auto send ConnectRsp for LE. Need to clean up config.

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

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 00:49:45 +0000 (00:49 +0000)]

Merge "Call EXPECT_CALL before the incoming event" am: e4bfe75a30

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

Change-Id: I02ee5fb7f129272f6d3b9679c080f26c0c1d776d

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 00:49:15 +0000 (00:49 +0000)]

Merge "Call EXPECT_CALL before the incoming event"

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 00:48:56 +0000 (00:48 +0000)]

Merge "SM: Implement name request during Classic pairing" am: d165f580d1

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

Change-Id: Iabe7191aa6c49e713210d8b37fe181a41164b8e9

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 00:00:20 +0000 (00:00 +0000)]

Merge "SM: Implement name request during Classic pairing"

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 23:59:06 +0000 (23:59 +0000)]

L2CAP: Remove unused ConnectRsp am: 3dbda905a5 am: a33066c188 am: f983d9a0cf

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

Change-Id: I5b9f0a4ebeec5cc4cbb767bd14418c4012328347

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 23:41:05 +0000 (23:41 +0000)]

L2CAP: Remove unused ConnectRsp am: 3dbda905a5 am: a33066c188

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

Change-Id: Ida07bf1545b2ce153908dcc30d39c54be5656467

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 23:19:52 +0000 (23:19 +0000)]

L2CAP: Remove unused ConnectRsp am: 3dbda905a5

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

Change-Id: I1c1428f21cc3233903e686f9cae3b922e08c8518

commit | commitdiff | tree

Martin Brabham [Mon, 28 Sep 2020 22:52:55 +0000 (15:52 -0700)]

Call EXPECT_CALL before the incoming event

Bug: 169598507
Tag: #stability
Test: atest --host bluetooth_test_gd
Change-Id: If58fa04c6c292c197959b14e29f52800fd14c03b

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:04:19 +0000 (22:04 +0000)]

RFCOMM, AVDT, HID: L2cap signal id is not used am: ade4d449cd am: 9f90030137 am: 67f2223175

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

Change-Id: I687725f51f3d2a8a983fbb1ac89356ecdf930583

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:04:08 +0000 (22:04 +0000)]

Include initial remote config in pL2CA_ConfigCfm_Cb am: aec9dadc2e am: 0d9deed5c0 am: da1b93a2ff

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

Change-Id: I62373ef7148801e17d6ea89e1b0cf2814f71a46c

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:03:49 +0000 (22:03 +0000)]

Serialize L2CAP connect ind/cfm, config ind, cfm am: b737b6dcda am: 23615d56c8 am: f2b0bbfe61

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

Change-Id: I646c9e27831f9fbde6ede9edbd7c174034eab0a5

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:03:48 +0000 (22:03 +0000)]

L2cap: Auto send ConnectRsp am: d8d7224c2e am: 1b00239503 am: 22e091bdec

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

Change-Id: Ic904100b9355d60a6e320b8773868245597c0424

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:03:47 +0000 (22:03 +0000)]

Check for control block nullptr on l2cap error am: d77658a680 am: 7a0ce3e74c am: 91e5f57877

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

Change-Id: I369e4d631e4463303b8058f88ad20f75ab4c4869

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:03:46 +0000 (22:03 +0000)]

L2cap channel cb: Store who initiated dynamic channel am: 7bfe49749a am: d1b11fe61f am: b2065b15d3

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

Change-Id: Id140a3345f73d1fcc461db2222875c7a8dbe5328

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:03:45 +0000 (22:03 +0000)]

We always send pL2CA_ConfigCfm_Cb with status OK am: 40b23cc4ab am: 1bb6f231ce am: e2b2f0ab37

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

Change-Id: Ice3d5df0f95b8904621541d657e40009807f24b6

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:03:44 +0000 (22:03 +0000)]

L2cap shim clean up am: ee79913590 am: 6ca4f683bd am: 572ed18ef8

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

Change-Id: Iace9796ada5cb3048531d50689717313967fbe54

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:03:43 +0000 (22:03 +0000)]

L2CAP_FLUSHABLE_PKT is never used am: 6b63057385 am: 6c7a566cd4 am: 79bf67498a

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

Change-Id: I63df4eaffc6fc76b50a8443c92aa908a011eef41

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:03:42 +0000 (22:03 +0000)]

Minor clean up in l2c_api am: 324f7e9cec am: adc9e08a37 am: e329fba87d

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

Change-Id: I05aa766112e6f0661f685c351b72b12a0a2ba3d7

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:03:41 +0000 (22:03 +0000)]

L2cap: Simplify DisconnectRsp am: 014930dadc am: fe33b32020 am: f04645054c

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

Change-Id: I5110e92c0284e9ccaeb4879e7c3fd4aefa6fe0fb

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:03:01 +0000 (22:03 +0000)]

Remove unused L2cap code am: 2d291bead0 am: f56c1b1e0a am: ee9b12cbc6

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

Change-Id: Ifadf45c4fc32eb3921666754d837164f0be848ed

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:02:58 +0000 (22:02 +0000)]

Simplify avdt_sec_check_complete_term am: 1d6fa5e136 am: 41cb6069c9 am: 4d1656d1ea

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

Change-Id: I308d2990de91b66bd32d32551bca5e58ef26a851

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 22:02:56 +0000 (22:02 +0000)]

Simplify bnep_sec_check_complete am: 86fbde4a5e am: e96b0443a4 am: 57455d8f4d

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

Change-Id: I8ecdf770320d59674245cb6c5bdf54316d25e47d

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:47:59 +0000 (21:47 +0000)]

RFCOMM, AVDT, HID: L2cap signal id is not used am: ade4d449cd am: 9f90030137

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

Change-Id: If408df5c24ac53c76b73f7ef2001a17207b1ad58

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:42:30 +0000 (21:42 +0000)]

Include initial remote config in pL2CA_ConfigCfm_Cb am: aec9dadc2e am: 0d9deed5c0

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

Change-Id: I2cfbc071b90d2fd5d068b3a20afba7560b094df0

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:42:17 +0000 (21:42 +0000)]

Serialize L2CAP connect ind/cfm, config ind, cfm am: b737b6dcda am: 23615d56c8

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

Change-Id: I35a95dc88c823a66d01e1b4003bae26640ee2e07

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:42:16 +0000 (21:42 +0000)]

L2cap: Auto send ConnectRsp am: d8d7224c2e am: 1b00239503

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

Change-Id: I60141e2d1aa5df7d608fccc6701cd754644c21b7

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:42:15 +0000 (21:42 +0000)]

Check for control block nullptr on l2cap error am: d77658a680 am: 7a0ce3e74c

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

Change-Id: Ib226e9357eb13baa7c971261702856b9cf715c55

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:42:14 +0000 (21:42 +0000)]

L2cap channel cb: Store who initiated dynamic channel am: 7bfe49749a am: d1b11fe61f

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

Change-Id: I5c59b64189a4e929e474a7c6d13747d3cd527eb6

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:42:14 +0000 (21:42 +0000)]

We always send pL2CA_ConfigCfm_Cb with status OK am: 40b23cc4ab am: 1bb6f231ce

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

Change-Id: Ib027c448ea97732bec594a8bdd37c8845c9e1b68

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:42:12 +0000 (21:42 +0000)]

L2cap shim clean up am: ee79913590 am: 6ca4f683bd

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

Change-Id: I4514eb872e52bde4326e7afc03877be8ae9cd944

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:42:08 +0000 (21:42 +0000)]

L2CAP_FLUSHABLE_PKT is never used am: 6b63057385 am: 6c7a566cd4

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

Change-Id: Ib3048441c7adeb7a4ff48cee5881b2359347167c

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:42:04 +0000 (21:42 +0000)]

Minor clean up in l2c_api am: 324f7e9cec am: adc9e08a37

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

Change-Id: I36cf6452ba6324ba18fffa2d26f63ecfa10a38e9

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:42:01 +0000 (21:42 +0000)]

L2cap: Simplify DisconnectRsp am: 014930dadc am: fe33b32020

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

Change-Id: Ib2672bb56d2793da4473f7b104f82605d7f7979f

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:41:52 +0000 (21:41 +0000)]

RFCOMM, AVDT, HID: L2cap signal id is not used am: ade4d449cd

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

Change-Id: I4399b307c9f1bcc565319eba09b60a9a49133bf2

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:41:32 +0000 (21:41 +0000)]

Remove unused L2cap code am: 2d291bead0 am: f56c1b1e0a

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

Change-Id: I7c17ef1a11a3e0b6ac8f98bccfbba91b7f892648

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:41:30 +0000 (21:41 +0000)]

Simplify avdt_sec_check_complete_term am: 1d6fa5e136 am: 41cb6069c9

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

Change-Id: I3a2c972f6d2103003156efef3df8035d9658451d

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:41:27 +0000 (21:41 +0000)]

Simplify bnep_sec_check_complete am: 86fbde4a5e am: e96b0443a4

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

Change-Id: I87d9fd1e93064f2b4c0a9f2cd3387a38698c8146

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:28:57 +0000 (21:28 +0000)]

Include initial remote config in pL2CA_ConfigCfm_Cb am: aec9dadc2e

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

Change-Id: I4d30931e1ce85e2593d04ef2fdae81bae5952cfd

commit | commitdiff | tree

Martin Brabham [Fri, 4 Sep 2020 05:03:32 +0000 (22:03 -0700)]

SM: Implement name request during Classic pairing

Ensure we try to receive the name and wait for it before
we show the UserConfirmation Dialog.

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I6a4401873770f7f642e06da34002dba55e5f049e

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:55:14 +0000 (20:55 +0000)]

Serialize L2CAP connect ind/cfm, config ind, cfm am: b737b6dcda

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

Change-Id: I20205d2b00a0576eb2413dce747356262db40bf2

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:55:12 +0000 (20:55 +0000)]

L2cap: Auto send ConnectRsp am: d8d7224c2e

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

Change-Id: I260ba6995b80b8f1ffc8bfee879c9b27d3320b04

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:55:08 +0000 (20:55 +0000)]

Check for control block nullptr on l2cap error am: d77658a680

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

Change-Id: I3c574634a60a0a4f376b8670330a848045689efb

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:55:05 +0000 (20:55 +0000)]

L2cap channel cb: Store who initiated dynamic channel am: 7bfe49749a

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

Change-Id: I3c642a89b7ca5c38fad8ed3905f224a32c67a738

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:55:02 +0000 (20:55 +0000)]

We always send pL2CA_ConfigCfm_Cb with status OK am: 40b23cc4ab

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

Change-Id: I21c840a6db17549af0a378cf5af3f57c91facd93

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:58 +0000 (20:54 +0000)]

L2cap shim clean up am: ee79913590

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

Change-Id: I4158575f6fc937f5c061aad1e9bf14b72381c274

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:55 +0000 (20:54 +0000)]

L2CAP_FLUSHABLE_PKT is never used am: 6b63057385

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

Change-Id: Ie5273670372d83b30ff1f6cf3406843496d917d7

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:51 +0000 (20:54 +0000)]

Minor clean up in l2c_api am: 324f7e9cec

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

Change-Id: I436a7ffeabe9c926062f05831aea7056396b1158

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:48 +0000 (20:54 +0000)]

L2cap: Simplify DisconnectRsp am: 014930dadc

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

Change-Id: Iefab338e11f2815cce8e352d679f2e410cae93a0

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:29 +0000 (20:54 +0000)]

Remove unused L2cap code am: 2d291bead0

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

Change-Id: Ie3beca412e99a47bfe4d2d07452ed1d98388d0ef

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:24 +0000 (20:54 +0000)]

Simplify avdt_sec_check_complete_term am: 1d6fa5e136

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

Change-Id: Ie361553e46e0bf5c56503b0a1153d9791bba476f

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:53:44 +0000 (20:53 +0000)]

Simplify bnep_sec_check_complete am: 86fbde4a5e

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

Change-Id: Idb4a0b924b656e23556d6161da055fe6a8de2398

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:13:35 +0000 (20:13 +0000)]

l2c_csm: Use pL2CA_Error_Cb on error am: 30a07c56e1 am: 7f4a3dac18 am: 76d953e9b6

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

Change-Id: I3256c8fce9a6949953aeec0a9f9455c303849462

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:13:32 +0000 (20:13 +0000)]

Regard L2CAP_CFG_PENDING as failure am: 5b85860bd5 am: eb9cc47787 am: 48584bc8ab

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

Change-Id: Ice44d8442da97fc1e77e57ff3b5bdbc984169f2c

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:00:18 +0000 (13:00 -0700)]

L2CAP: Remove unused ConnectRsp

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

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 19:55:17 +0000 (19:55 +0000)]

l2c_csm: Use pL2CA_Error_Cb on error am: 30a07c56e1 am: 7f4a3dac18

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

Change-Id: Ib1984734eda6f9ce33fcbefce71d59ffc68d34b0

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 19:55:15 +0000 (19:55 +0000)]

Regard L2CAP_CFG_PENDING as failure am: 5b85860bd5 am: eb9cc47787

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

Change-Id: I9aca2ee3eaa75ae8e5b855cf1c4ccadc2e9202bb

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 19:40:00 +0000 (12:40 -0700)]

RFCOMM, AVDT, HID: L2cap signal id is not used

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

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 19:20:19 +0000 (12:20 -0700)]

Include initial remote config in pL2CA_ConfigCfm_Cb

So we don't need to send a separate pL2CA_ConfigInd_Cb.

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

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 19:03:43 +0000 (19:03 +0000)]

l2c_csm: Use pL2CA_Error_Cb on error am: 30a07c56e1

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

Change-Id: I5d53012f81c0ee4358948654418600b897f1f34b

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 19:02:50 +0000 (19:02 +0000)]

Regard L2CAP_CFG_PENDING as failure am: 5b85860bd5

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

Change-Id: I9d42ccf85dc915acb2561a63d2718bbb1d5c08bf

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 06:59:00 +0000 (23:59 -0700)]

Serialize L2CAP connect ind/cfm, config ind, cfm

Make them happen at one place.

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

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 23:49:17 +0000 (16:49 -0700)]

L2cap: Auto send ConnectRsp

In the past, L2cap user can decide whether to accept or reject a
ConnectReq. If reject, the channel is closed.

Now let L2cap layer always auto accept the remote ConnectReq and start
config process. If the L2cap user wants to reject, they can send a
DisconnectReq. According to L2cap state machine, a DisconnectReq after
ConnectRsp terminates the channel, which is equivalent to sending a
negative ConnectRsp, as before.

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

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 23:30:03 +0000 (16:30 -0700)]

Check for control block nullptr on l2cap error

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

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 23:12:43 +0000 (16:12 -0700)]

L2cap channel cb: Store who initiated dynamic channel

Use pL2CA_ConfigCfm_Cb to let user know the direction.

Later the user can run check in ConnectInd or ConnectCfm callback.

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

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 22:53:12 +0000 (15:53 -0700)]

We always send pL2CA_ConfigCfm_Cb with status OK

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

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 22:18:57 +0000 (15:18 -0700)]

L2cap shim clean up

Now we send ConfigReq and ConfigRsp automatically, we need to send
callbacks automatically.

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

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 21:23:20 +0000 (14:23 -0700)]

L2CAP_FLUSHABLE_PKT is never used

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

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 17:31:22 +0000 (17:31 +0000)]

Introduce pL2CA_Error_Cb am: b6e5a07555 am: cc102a7286 am: 0dcc4aea20

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

Change-Id: I2a938c79536402305cd1097f6a2bd8deea68a001

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 17:31:19 +0000 (17:31 +0000)]

l2c_csm: Remove unused variable am: 5020f1c00f am: 1e68d372f3 am: 9f16dc312c

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

Change-Id: I0ee02fd48260243ef426688765bf05db344a0811

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 17:09:20 +0000 (17:09 +0000)]

Introduce pL2CA_Error_Cb am: b6e5a07555 am: cc102a7286

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

Change-Id: Icae7a509d9d3cdd276e8911175c02408ce44dd58

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 17:09:17 +0000 (17:09 +0000)]

l2c_csm: Remove unused variable am: 5020f1c00f am: 1e68d372f3

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

Change-Id: I471805d4fb858f14122a743102788ec7f19fcd24

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 16:48:11 +0000 (16:48 +0000)]

Introduce pL2CA_Error_Cb am: b6e5a07555

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

Change-Id: I4af7949c994761ee6b3a7b6c2808a8077fafdfc7

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 16:47:19 +0000 (16:47 +0000)]

l2c_csm: Remove unused variable am: 5020f1c00f

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

Change-Id: I7a4ad9d2b31de4811798dcbb206702be137de7b2

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 07:24:48 +0000 (00:24 -0700)]

Minor clean up in l2c_api

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

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 07:12:49 +0000 (00:12 -0700)]

L2cap: Simplify DisconnectRsp

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

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 07:03:53 +0000 (00:03 -0700)]

Remove unused L2cap code

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

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 00:59:51 +0000 (17:59 -0700)]

Simplify avdt_sec_check_complete_term

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

commit | commitdiff | tree

Hansong Zhang [Sun, 27 Sep 2020 00:42:02 +0000 (17:42 -0700)]

Simplify bnep_sec_check_complete

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

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:58:47 +0000 (16:58 -0700)]

l2c_csm: Use pL2CA_Error_Cb on error

Note that we only have two result codes, because the user only needs to
know whether it's during ConnectRsp or ConfigRsp (except for HIDH
retry), which we need further research.

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

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:48:40 +0000 (16:48 -0700)]

Regard L2CAP_CFG_PENDING as failure

Since all L2CAP users disconnect if the status is not OK.

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

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:39:28 +0000 (16:39 -0700)]

Introduce pL2CA_Error_Cb

L2CAP notifies users error in ConnectRsp and ConfigRsp through this
callback function (not linked so far). Next step is we send success
through pL2CA_ConnectCfm_Cb and pL2CA_ConfigCfm_Cb.

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

commit | commitdiff | tree

Hansong Zhang [Sat, 26 Sep 2020 23:20:31 +0000 (16:20 -0700)]

l2c_csm: Remove unused variable

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

commit | commitdiff | tree

Treehugger Robot [Mon, 28 Sep 2020 03:45:33 +0000 (03:45 +0000)]

Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux" am: 960730c35b am: c45116e6e5 am: a430fb8a56

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

Change-Id: If75103e0e812e67a70f9f46d53575d1e0a84e97a

commit | commitdiff | tree

Treehugger Robot [Mon, 28 Sep 2020 03:32:59 +0000 (03:32 +0000)]

Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux" am: 960730c35b am: c45116e6e5

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

Change-Id: I969910892c7a24aedbf42e03bca7d9a4f9484844

commit | commitdiff | tree

Treehugger Robot [Mon, 28 Sep 2020 03:01:03 +0000 (03:01 +0000)]

Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux" am: 960730c35b

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

Change-Id: Ic78e1a205f0e6c32291968257f6e069b1579dfb9

commit | commitdiff | tree

Treehugger Robot [Mon, 28 Sep 2020 02:28:06 +0000 (02:28 +0000)]

Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux"

commit | commitdiff | tree

Treehugger Robot [Mon, 28 Sep 2020 01:31:10 +0000 (01:31 +0000)]

Merge "Set apex_available property" am: 9a5637591a am: f99b45ed3d am: 61d8361c56

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

Change-Id: I65c48bdce23f76e1be79dfb8f48ecb0bb2c61a05

commit | commitdiff | tree

Treehugger Robot [Mon, 28 Sep 2020 00:57:12 +0000 (00:57 +0000)]

Merge "Set apex_available property" am: 9a5637591a am: f99b45ed3d

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

Change-Id: Iea0150cbb7c04df34d3f15acbe424c4f15593934

system/bt

RSS Atom

About OSDN

Find Software

Develop Software

Help