OSDN Git Service

android-x86/system-bt.git
4 years agoMerge "Make sure only valid packet fields are accessed in VendorPacketHandler"
TreeHugger Robot [Thu, 23 Jan 2020 20:29:37 +0000 (20:29 +0000)]
Merge "Make sure only valid packet fields are accessed in VendorPacketHandler"

4 years agoMake sure only valid packet fields are accessed in VendorPacketHandler
Jakub Pawlowski [Thu, 23 Jan 2020 13:32:56 +0000 (14:32 +0100)]
Make sure only valid packet fields are accessed in VendorPacketHandler

Move packet validation above first access to GetEvent()

Bug: 144066833
Test: avrcp_device_fuzz
Change-Id: I62c03763e7e921adc3456c53090fbf30ff87946e

4 years agoSecurityModule: Add callbacks to your callbacks am: 6fd5b6bec7 am: aaaf6c5902 am...
Automerger Merge Worker [Wed, 22 Jan 2020 22:52:31 +0000 (22:52 +0000)]
SecurityModule: Add callbacks to your callbacks am: 6fd5b6bec7 am: aaaf6c5902 am: ff080d48fd

Change-Id: I9bcf8cc15255480be9205c524ccd587c3fa0a9a3

4 years agoSecurityModule: Add callbacks to your callbacks am: 6fd5b6bec7 am: aaaf6c5902
Automerger Merge Worker [Wed, 22 Jan 2020 22:39:37 +0000 (22:39 +0000)]
SecurityModule: Add callbacks to your callbacks am: 6fd5b6bec7 am: aaaf6c5902

Change-Id: I89215122e1a32f5500e7b1c79748216d7c784285

4 years agoSecurityModule: Add callbacks to your callbacks
Martin Brabham [Wed, 22 Jan 2020 22:23:42 +0000 (14:23 -0800)]
SecurityModule: Add callbacks to your callbacks
am: 6fd5b6bec7

Change-Id: Id2cc55acf5c3efa6915eca855704825e716caf97

4 years agoL2cap/Hci: Add call for feature exchange am: 10b62ca89f am: 6ed8790afe am: 03c36b287c
Automerger Merge Worker [Wed, 22 Jan 2020 20:20:28 +0000 (20:20 +0000)]
L2cap/Hci: Add call for feature exchange am: 10b62ca89f am: 6ed8790afe am: 03c36b287c

Change-Id: I1bb498bcfae53aa3b42adad56bdc8d3c7d690672

4 years agoL2cap/Hci: Add call for feature exchange am: 10b62ca89f am: 6ed8790afe
Automerger Merge Worker [Wed, 22 Jan 2020 20:11:17 +0000 (20:11 +0000)]
L2cap/Hci: Add call for feature exchange am: 10b62ca89f am: 6ed8790afe

Change-Id: I03b3390f8ef924eead45fa7db1c12152876b3ac2

4 years agoL2cap/Hci: Add call for feature exchange
Martin Brabham [Wed, 22 Jan 2020 19:59:11 +0000 (11:59 -0800)]
L2cap/Hci: Add call for feature exchange
am: 10b62ca89f

Change-Id: Ifd7dae3eedeb35948fef92a8194181d7815ebaab

4 years agoSecurityModule: Add callbacks to your callbacks
Martin Brabham [Thu, 16 Jan 2020 19:18:42 +0000 (11:18 -0800)]
SecurityModule: Add callbacks to your callbacks

Add an argument to the external callback signature in order
to allow external caller to input user responses.

Bug: 139137147
Test: ./out/host/linux-x86/nativetest64/bluetooth_test_gd/bluetooth_test_gd --gtest_filter=ClassicPairing*
Change-Id: Ib827991dd2827ec0bad0206192387ad66696d740

4 years agoMerge "Zip cert resources and scripts" am: a8e924c0cf am: 5a0712ca1a am: 6b5a90c693
Automerger Merge Worker [Wed, 22 Jan 2020 18:25:03 +0000 (18:25 +0000)]
Merge "Zip cert resources and scripts" am: a8e924c0cf am: 5a0712ca1a am: 6b5a90c693

Change-Id: Ib554b50a895e7b308f0f1f6633ba1ac234d43d08

4 years agoMerge "Zip cert resources and scripts" am: a8e924c0cf am: 5a0712ca1a
Automerger Merge Worker [Wed, 22 Jan 2020 18:15:24 +0000 (18:15 +0000)]
Merge "Zip cert resources and scripts" am: a8e924c0cf am: 5a0712ca1a

Change-Id: Ic606cf043eb37dda526ab2fc9c10325c17cc46cb

4 years agoL2cap/Hci: Add call for feature exchange
Martin Brabham [Thu, 16 Jan 2020 23:49:59 +0000 (15:49 -0800)]
L2cap/Hci: Add call for feature exchange

Bug: 145638034
Test: N/A
Change-Id: I811856672663874928b98137f16e6aee2e612caf

4 years agoMerge "Zip cert resources and scripts"
Hansong Zhang [Wed, 22 Jan 2020 17:59:22 +0000 (09:59 -0800)]
Merge "Zip cert resources and scripts"
am: a8e924c0cf

Change-Id: I1f458530cd512d25522c5d829a9f0967e98c9d00

4 years agoMerge "Zip cert resources and scripts"
Treehugger Robot [Wed, 22 Jan 2020 17:43:45 +0000 (17:43 +0000)]
Merge "Zip cert resources and scripts"

4 years agoMerge "Cert: Check that child returns 0 or -signal" am: a74dfac562 am: cd17421c58...
Automerger Merge Worker [Wed, 22 Jan 2020 04:31:21 +0000 (04:31 +0000)]
Merge "Cert: Check that child returns 0 or -signal" am: a74dfac562 am: cd17421c58 am: 0b482adec8

Change-Id: I3297de80b81e60bcedd7ace7be379a42cf28f092

4 years agoMerge "Cert: Check that child returns 0 or -signal" am: a74dfac562 am: cd17421c58
Automerger Merge Worker [Wed, 22 Jan 2020 04:19:07 +0000 (04:19 +0000)]
Merge "Cert: Check that child returns 0 or -signal" am: a74dfac562 am: cd17421c58

Change-Id: Idc60c27a36e5f260295830d88c40c7da3d009b34

4 years agoMerge "Cert: Check that child returns 0 or -signal"
Myles Watson [Wed, 22 Jan 2020 04:04:28 +0000 (20:04 -0800)]
Merge "Cert: Check that child returns 0 or -signal"
am: a74dfac562

Change-Id: I048ad5c5c0ec9718b43ef076bc89f25f911ede70

4 years agoMerge "Cert: Check that child returns 0 or -signal"
Treehugger Robot [Wed, 22 Jan 2020 03:27:26 +0000 (03:27 +0000)]
Merge "Cert: Check that child returns 0 or -signal"

4 years agoMerge "gd: Fix for l2cap connection on failure" am: 2898ad8efd am: 70d3b8e4c1 am...
Automerger Merge Worker [Wed, 22 Jan 2020 00:38:07 +0000 (00:38 +0000)]
Merge "gd: Fix for l2cap connection on failure" am: 2898ad8efd am: 70d3b8e4c1 am: ccac3dc071

Change-Id: I1aef448259082a2639ac9ddceff32f070602d29d

4 years agoMerge "HCI: Add LocalName test" am: 31e43edf83 am: 431f0d18cb am: fbee028f1f
Automerger Merge Worker [Wed, 22 Jan 2020 00:37:55 +0000 (00:37 +0000)]
Merge "HCI: Add LocalName test" am: 31e43edf83 am: 431f0d18cb am: fbee028f1f

Change-Id: Ib2e2fb426218285a65da499316a96c7ee2b804cd

4 years agoMerge "gd: Fix for l2cap connection on failure" am: 2898ad8efd am: 70d3b8e4c1
Automerger Merge Worker [Wed, 22 Jan 2020 00:26:28 +0000 (00:26 +0000)]
Merge "gd: Fix for l2cap connection on failure" am: 2898ad8efd am: 70d3b8e4c1

Change-Id: Ib3c01811c71896b3a56ad74120dc2400e102d99b

4 years agoMerge "HCI: Add LocalName test" am: 31e43edf83 am: 431f0d18cb
Automerger Merge Worker [Wed, 22 Jan 2020 00:26:17 +0000 (00:26 +0000)]
Merge "HCI: Add LocalName test" am: 31e43edf83 am: 431f0d18cb

Change-Id: I936052bdf15328e99ab5bdda8fac9fca749d847b

4 years agoMerge "Initial entry for headless" am: 562ec8ffd5 am: f060d956c5 am: 01d826e151
Automerger Merge Worker [Wed, 22 Jan 2020 00:20:19 +0000 (00:20 +0000)]
Merge "Initial entry for headless" am: 562ec8ffd5 am: f060d956c5 am: 01d826e151

Change-Id: I4c9acd93e07db56ce92abdae290e97178a8125b3

4 years agoMerge "gd: Fix for l2cap connection on failure"
Chris Manton [Wed, 22 Jan 2020 00:17:08 +0000 (16:17 -0800)]
Merge "gd: Fix for l2cap connection on failure"
am: 2898ad8efd

Change-Id: I6914a456964dbd0ffc73d57d7901951bd332d33b

4 years agoMerge "HCI: Add LocalName test"
Myles Watson [Wed, 22 Jan 2020 00:16:29 +0000 (16:16 -0800)]
Merge "HCI: Add LocalName test"
am: 31e43edf83

Change-Id: I137ddd270e8ab32ac5ee207754361d623ab0e52e

4 years agoMerge "gd: Fix for l2cap connection on failure"
Treehugger Robot [Wed, 22 Jan 2020 00:12:27 +0000 (00:12 +0000)]
Merge "gd: Fix for l2cap connection on failure"

4 years agoMerge "HCI: Add LocalName test"
Treehugger Robot [Wed, 22 Jan 2020 00:11:20 +0000 (00:11 +0000)]
Merge "HCI: Add LocalName test"

4 years agoMerge "Initial entry for headless" am: 562ec8ffd5 am: f060d956c5
Automerger Merge Worker [Wed, 22 Jan 2020 00:08:08 +0000 (00:08 +0000)]
Merge "Initial entry for headless" am: 562ec8ffd5 am: f060d956c5

Change-Id: I7accffa71e65cea88c20dab802b69875e51e52d8

4 years agoZip cert resources and scripts
Hansong Zhang [Mon, 13 Jan 2020 23:47:22 +0000 (15:47 -0800)]
Zip cert resources and scripts

Test: compile
Change-Id: Ib11e566273a3bdd62ad791d0a66d36ebde5d6f39

4 years agoSplit ports for device and root-canal tests am: 82ec67d4fb am: 1d66ad4fc7 am: 1f5a08b8b2
Automerger Merge Worker [Wed, 22 Jan 2020 00:02:06 +0000 (00:02 +0000)]
Split ports for device and root-canal tests am: 82ec67d4fb am: 1d66ad4fc7 am: 1f5a08b8b2

Change-Id: Ibc57964a75fbdd1ac4e6e55ee26690361923fc38

4 years agoMerge "Initial entry for headless"
Chris Manton [Tue, 21 Jan 2020 23:59:30 +0000 (15:59 -0800)]
Merge "Initial entry for headless"
am: 562ec8ffd5

Change-Id: Ib413fd98722a37ccbc703a5c3d253fa68fd1c5f1

4 years agoMerge "Initial entry for headless"
Treehugger Robot [Tue, 21 Jan 2020 23:56:10 +0000 (23:56 +0000)]
Merge "Initial entry for headless"

4 years agoSplit ports for device and root-canal tests am: 82ec67d4fb am: 1d66ad4fc7
Automerger Merge Worker [Tue, 21 Jan 2020 23:48:00 +0000 (23:48 +0000)]
Split ports for device and root-canal tests am: 82ec67d4fb am: 1d66ad4fc7

Change-Id: Id0df211cde01e3d297b70103b1b8e48a06753221

4 years agoSplit ports for device and root-canal tests
Myles Watson [Tue, 21 Jan 2020 23:32:17 +0000 (15:32 -0800)]
Split ports for device and root-canal tests
am: 82ec67d4fb

Change-Id: I7cd54d1ebbaa376980dc4eb258258834e3084e47

4 years agoHCI: Add LocalName test
Myles Watson [Fri, 17 Jan 2020 17:37:25 +0000 (09:37 -0800)]
HCI: Add LocalName test

Bug: 147444951
Test: ./cert/run_device_cert.sh
Change-Id: I9d3345d2316357beac727c9245134a8994aba25b

4 years agogd: Fix for l2cap connection on failure
Chris Manton [Tue, 21 Jan 2020 19:34:00 +0000 (11:34 -0800)]
gd: Fix for l2cap connection on failure

Included method and parameter naming updates to reflect functionality

Bug: 140778599
Test: bt_headless with failing params

Change-Id: I5ed4e2769f7c8f6f78a92af76545e3a0e41582d1

4 years agoInitial entry for headless
Chris Manton [Wed, 15 Jan 2020 00:34:08 +0000 (16:34 -0800)]
Initial entry for headless

Bug: 147316415
Test: Compiles and sdp test runs

Change-Id: I2db01df68fb8807ce934b59aab5a4f593d4f8074

4 years agoSplit ports for device and root-canal tests
Myles Watson [Fri, 17 Jan 2020 21:46:23 +0000 (13:46 -0800)]
Split ports for device and root-canal tests

Use 89xx ports for Root-canal tests and 88xx for device tests.

Bug: 148096951
Test: ./cert/run_device_cert.sh && ./cert/run_cert_facade_only.sh
Change-Id: I4ad9357d882668058450b42473addb69a290e7f5

4 years agoMerge "ACL packet recombination" am: 3102f77de0 am: e80ee98a4a am: 91c4a91f98
Automerger Merge Worker [Tue, 21 Jan 2020 20:41:21 +0000 (20:41 +0000)]
Merge "ACL packet recombination" am: 3102f77de0 am: e80ee98a4a am: 91c4a91f98

Change-Id: I9acb1809c86b6d676b7177cf7c8c95d4f8d0a2bf

4 years agoMerge "ACL packet recombination" am: 3102f77de0 am: e80ee98a4a
Automerger Merge Worker [Tue, 21 Jan 2020 20:27:24 +0000 (20:27 +0000)]
Merge "ACL packet recombination" am: 3102f77de0 am: e80ee98a4a

Change-Id: I25f06e4a08cb7e82995b87d77df4f2f28b09f91f

4 years agoMerge "ACL packet recombination"
Hansong Zhang [Tue, 21 Jan 2020 20:19:54 +0000 (12:19 -0800)]
Merge "ACL packet recombination"
am: 3102f77de0

Change-Id: I69757b56781e026071ef20727f2a38c7869af464

4 years agoMerge "ACL packet recombination"
Treehugger Robot [Tue, 21 Jan 2020 20:08:55 +0000 (20:08 +0000)]
Merge "ACL packet recombination"

4 years agoACL packet recombination
Hansong Zhang [Thu, 16 Jan 2020 22:05:41 +0000 (14:05 -0800)]
ACL packet recombination

Recombine ACL fragments according to indicated L2CAP PDU size. Used the
workaround that rootcanal always sends the same ACL packet to remote to
verify.

Also added ACL fragmentation support in rootcanal. Recombination in
rootcanal is not supported so far, so whenever we want to send an ACL
packet fragment, we never buffer it until we have a complete L2CAP PDU.

Test: cert/run_cert_facade_only.sh run_cert.sh
Change-Id: Ieb4d3c987327867a39ce210474b84645175b8984

4 years agoFix legacy shim namespace am: b22d23d374 am: 353cff16d0 am: 4d23448453
Automerger Merge Worker [Mon, 20 Jan 2020 21:20:17 +0000 (21:20 +0000)]
Fix legacy shim namespace am: b22d23d374 am: 353cff16d0 am: 4d23448453

Change-Id: Ie3bdaf2409c05a99aeec9616511f6ec8b973ab71

4 years agoRefactor dumpsys apis for legacy and gd am: ff7ffd09fc am: 94d4e2cb7d am: 83402ba482
Automerger Merge Worker [Mon, 20 Jan 2020 21:20:09 +0000 (21:20 +0000)]
Refactor dumpsys apis for legacy and gd am: ff7ffd09fc am: 94d4e2cb7d am: 83402ba482

Change-Id: I9ad0fe1ad2d32f5c857eb148c174c1c5f4bef9b8

4 years agoFix legacy shim namespace am: b22d23d374 am: 353cff16d0
Automerger Merge Worker [Mon, 20 Jan 2020 21:11:33 +0000 (21:11 +0000)]
Fix legacy shim namespace am: b22d23d374 am: 353cff16d0

Change-Id: I1d02e3c17e5a651b7e7398e47caf346485624670

4 years agoRefactor dumpsys apis for legacy and gd am: ff7ffd09fc am: 94d4e2cb7d
Automerger Merge Worker [Mon, 20 Jan 2020 21:11:22 +0000 (21:11 +0000)]
Refactor dumpsys apis for legacy and gd am: ff7ffd09fc am: 94d4e2cb7d

Change-Id: Ib1b5df714a6e23b23eb3285be646528ae1e25ab0

4 years agoFix legacy shim namespace
Chris Manton [Mon, 20 Jan 2020 20:57:13 +0000 (12:57 -0800)]
Fix legacy shim namespace
am: b22d23d374

Change-Id: If665f563587efc22f604b96d3f6deac63bd74940

4 years agoRefactor dumpsys apis for legacy and gd
Chris Manton [Mon, 20 Jan 2020 20:56:34 +0000 (12:56 -0800)]
Refactor dumpsys apis for legacy and gd
am: ff7ffd09fc

Change-Id: I6a3b86f56711cef4748ae5130d2a280149a60b2f

4 years agoFix legacy shim namespace
Chris Manton [Sun, 19 Jan 2020 01:29:38 +0000 (17:29 -0800)]
Fix legacy shim namespace

Align namespaces to adhere to convention

Bug: 140421732
Test: Builds
Change-Id: I23e716f7250b79d147ba0db974b91578ebf63d56

4 years agoRefactor dumpsys apis for legacy and gd
Chris Manton [Sat, 18 Jan 2020 03:25:36 +0000 (19:25 -0800)]
Refactor dumpsys apis for legacy and gd

Unify legacy and gd dumpsys syntax.
Fix static initialization order problem.

Bug: 147672133
Test: bt_headless and bluetooth_test_gd
Change-Id: I6f4d0d2c5611deace5a2a11eff8001b624b3dc62

4 years agoMerge "Shim stack facade test and fix for test" am: 18162fbdc1 am: faa47c7701 am...
Automerger Merge Worker [Sat, 18 Jan 2020 00:15:20 +0000 (00:15 +0000)]
Merge "Shim stack facade test and fix for test" am: 18162fbdc1 am: faa47c7701 am: 2510217be9

Change-Id: I7abcf2a2c190dca3f014ad3976edf8f9b34d3814

4 years agoMerge "Shim stack facade test and fix for test" am: 18162fbdc1 am: faa47c7701
Automerger Merge Worker [Sat, 18 Jan 2020 00:04:41 +0000 (00:04 +0000)]
Merge "Shim stack facade test and fix for test" am: 18162fbdc1 am: faa47c7701

Change-Id: I5db18a8ea1cbd4641cc7ad6761b8a98a6b40e20c

4 years agoMerge "Fix issue around Encryption during Pairing" am: 7a62e2814c am: e166d9901b...
Automerger Merge Worker [Fri, 17 Jan 2020 23:52:13 +0000 (23:52 +0000)]
Merge "Fix issue around Encryption during Pairing" am: 7a62e2814c am: e166d9901b am: dc618f501f

Change-Id: I709bddb6bcf2671e49827e9d2aaf4df6b35e31e7

4 years agoMerge "Shim stack facade test and fix for test"
Chris Manton [Fri, 17 Jan 2020 23:52:06 +0000 (15:52 -0800)]
Merge "Shim stack facade test and fix for test"
am: 18162fbdc1

Change-Id: Ic04bc30d0aa627eb7074e4089d61b0e7e72a7c50

4 years agoMerge "Shim stack facade test and fix for test"
Treehugger Robot [Fri, 17 Jan 2020 23:48:27 +0000 (23:48 +0000)]
Merge "Shim stack facade test and fix for test"

4 years agoMerge "Fix issue around Encryption during Pairing" am: 7a62e2814c am: e166d9901b
Automerger Merge Worker [Fri, 17 Jan 2020 23:38:10 +0000 (23:38 +0000)]
Merge "Fix issue around Encryption during Pairing" am: 7a62e2814c am: e166d9901b

Change-Id: Iaa216f51abb42fcf5123b16fdde7b50d0d784c1e

4 years agoMerge "Fix issue around Encryption during Pairing"
Jakub Pawlowski [Fri, 17 Jan 2020 23:23:44 +0000 (15:23 -0800)]
Merge "Fix issue around Encryption during Pairing"
am: 7a62e2814c

Change-Id: I93c00c88e047eb2947ec92bff6392c7b693f065b

4 years agoMerge "Fix issue around Encryption during Pairing"
Treehugger Robot [Fri, 17 Jan 2020 23:07:49 +0000 (23:07 +0000)]
Merge "Fix issue around Encryption during Pairing"

4 years agoShim stack facade test and fix for test
Chris Manton [Fri, 17 Jan 2020 18:32:53 +0000 (10:32 -0800)]
Shim stack facade test and fix for test

Accidently 'captured' a raw pointer into a unique
pointer, which forced deletion upon destruction
resulting in other modules who rely on the no-longer-
in-existance module to call the module's pure
virtual Stop() function which is a bad thing.

Bug: 140778599
Test: ./gd/cert/run_cert_facade_only.sh

Change-Id: Ie1e39430517e47497172786fe4d8ab4976c371b4

4 years agoMerge "Cert: Swap Cert and DUT for device tests" am: 12a6ff9be2 am: 05567c66ab am...
Automerger Merge Worker [Fri, 17 Jan 2020 22:25:17 +0000 (22:25 +0000)]
Merge "Cert: Swap Cert and DUT for device tests" am: 12a6ff9be2 am: 05567c66ab am: 59dd230da4

Change-Id: Ib9d27c2cd42b6bf2bc6e19ba89472a21d4347a4d

4 years agoMerge "Cert: Swap Cert and DUT for device tests" am: 12a6ff9be2 am: 05567c66ab
Automerger Merge Worker [Fri, 17 Jan 2020 22:11:54 +0000 (22:11 +0000)]
Merge "Cert: Swap Cert and DUT for device tests" am: 12a6ff9be2 am: 05567c66ab

Change-Id: I58ae07be285793ada699ea5a5dea3e0c7d516543

4 years agoMerge "Cert: Swap Cert and DUT for device tests"
Myles Watson [Fri, 17 Jan 2020 21:28:46 +0000 (13:28 -0800)]
Merge "Cert: Swap Cert and DUT for device tests"
am: 12a6ff9be2

Change-Id: I0656a250441cc1c53c32a929d1adcccdad8076ea

4 years agoMerge "Cert: Swap Cert and DUT for device tests"
Treehugger Robot [Fri, 17 Jan 2020 18:59:33 +0000 (18:59 +0000)]
Merge "Cert: Swap Cert and DUT for device tests"

4 years agoFix issue around Encryption during Pairing
Jakub Pawlowski [Fri, 17 Jan 2020 18:54:47 +0000 (19:54 +0100)]
Fix issue around Encryption during Pairing

* ECC_PointMult erases private key argument, pass copy instead of
original value.
* Specify Z parameter for ECC Points

This fixes issues where LE Secure connection pairing between old and new
stack was failing due to DHKey mismatch

Test: manual pairing between phone running new and old stack
Bug: 147086339
Change-Id: Ied3404c2eb2ca55b717042ea099e1aefed1c3e8d

4 years agoCert: Check that child returns 0 or -signal
Myles Watson [Fri, 17 Jan 2020 17:33:26 +0000 (09:33 -0800)]
Cert: Check that child returns 0 or -signal

Bug: 147444951
Test: ./cert/run_device_cert.sh
Change-Id: I1628a039a90b6a389509afa28e59d1f23c622531

4 years agoMerge "Hid: Fix connection issue with legacy mouse" am: ab2c35908d am: 778ae7068e...
Automerger Merge Worker [Fri, 17 Jan 2020 17:18:56 +0000 (17:18 +0000)]
Merge "Hid: Fix connection issue with legacy mouse" am: ab2c35908d am: 778ae7068e am: f195417c04

Change-Id: I57e5066532fdacea30d6f785c3dea93aaa071779

4 years agoMerge "Hid: Fix connection issue with legacy mouse" am: ab2c35908d am: 778ae7068e
Automerger Merge Worker [Fri, 17 Jan 2020 17:03:27 +0000 (17:03 +0000)]
Merge "Hid: Fix connection issue with legacy mouse" am: ab2c35908d am: 778ae7068e

Change-Id: Iaedcfe827f81c31e7578a689c9f47b8f2e69b689

4 years agoMerge "Hid: Fix connection issue with legacy mouse" am: ab2c35908d
Automerger Merge Worker [Fri, 17 Jan 2020 16:53:55 +0000 (16:53 +0000)]
Merge "Hid: Fix connection issue with legacy mouse" am: ab2c35908d

Change-Id: Ib1ffbd58861ccccdc0f85c655ca9f00919d962bc

4 years agoMerge "Hid: Fix connection issue with legacy mouse"
Treehugger Robot [Fri, 17 Jan 2020 16:39:06 +0000 (16:39 +0000)]
Merge "Hid: Fix connection issue with legacy mouse"

4 years agoCert: Swap Cert and DUT for device tests
Myles Watson [Fri, 17 Jan 2020 16:28:02 +0000 (08:28 -0800)]
Cert: Swap Cert and DUT for device tests

Test: ./cert/run_device_cert.sh
Change-Id: Ib95eb8d2c7dacb252447902d0e0d6a366f20a01f

4 years agoMerge "LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed"...
Automerger Merge Worker [Fri, 17 Jan 2020 14:54:25 +0000 (14:54 +0000)]
Merge "LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed" am: 94193de298 am: 691efae186 am: 6c80dd576f

Change-Id: I436adcc0933a6a5f6260a60bc6a5143524ee908a

4 years agoMerge "LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed"...
Automerger Merge Worker [Fri, 17 Jan 2020 14:44:31 +0000 (14:44 +0000)]
Merge "LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed" am: 94193de298 am: 691efae186

Change-Id: I198ecd8da99c461dc16accc3e42c052ed060c474

4 years agoMerge "LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed"...
Automerger Merge Worker [Fri, 17 Jan 2020 14:35:26 +0000 (14:35 +0000)]
Merge "LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed" am: 94193de298

Change-Id: Ib8e62df817c00e9eeb36c7a79851fc54b6584a1e

4 years agoMerge "LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed"
Treehugger Robot [Fri, 17 Jan 2020 14:24:38 +0000 (14:24 +0000)]
Merge "LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed"

4 years agoHid: Fix connection issue with legacy mouse
sravan voleti [Fri, 17 Jan 2020 08:44:37 +0000 (14:14 +0530)]
Hid: Fix connection issue with legacy mouse

use case:
1) Pair and connect mouse from DUT
2) Unpair mouse from DUT UI
3) Try to pair from mouse, SDP connection from dut
    should fail during pairing.
4) Scan the mouse from DUT and initiate pairing.

Observed Results:
Pairing stuck in bonding state.

Root cause:
On sdp failure cases, HID incoming connection flags not cleared
 and leading to HID connection and pairing failure in next outgoing pairing.

Fix:
Reset hid incoming connection flags when sdp fails,
to fix connection issue with specific HID mouse.

Fixes: 147856205
Test: Tested above use case with legacy mouse, issue not observed.
Change-Id: I11b5d52a78f861cc270d0736c912cd40f1b76d6d

4 years agoMerge "A2DP: Based on the AAC parameters to calculate its encoder interval" am: b4aaf...
Automerger Merge Worker [Fri, 17 Jan 2020 07:12:14 +0000 (07:12 +0000)]
Merge "A2DP: Based on the AAC parameters to calculate its encoder interval" am: b4aaf488dd am: f6b052dd97 am: 47fb274fde

Change-Id: I2daf1b3c534230e6a1967c391b3d25b62d046420

4 years agoMerge "A2DP: Based on the AAC parameters to calculate its encoder interval" am: b4aaf...
Automerger Merge Worker [Fri, 17 Jan 2020 07:05:07 +0000 (07:05 +0000)]
Merge "A2DP: Based on the AAC parameters to calculate its encoder interval" am: b4aaf488dd am: f6b052dd97

Change-Id: I9222b70b30757c3f00bb60cdbf0516dad9b16894

4 years agoMerge "A2DP: Based on the AAC parameters to calculate its encoder interval" am: b4aaf...
Automerger Merge Worker [Fri, 17 Jan 2020 06:53:52 +0000 (06:53 +0000)]
Merge "A2DP: Based on the AAC parameters to calculate its encoder interval" am: b4aaf488dd

Change-Id: I97ebd6e841e32edd05a93a7f557d40036ae4efc4

4 years agoMerge "A2DP: Based on the AAC parameters to calculate its encoder interval"
Treehugger Robot [Fri, 17 Jan 2020 06:45:20 +0000 (06:45 +0000)]
Merge "A2DP: Based on the AAC parameters to calculate its encoder interval"

4 years agoRootcanal: Always send FIRST_NON_AUTOMATICALLY_FLUSHABLE am: 32a732d317 am: ea7742dd1...
Automerger Merge Worker [Fri, 17 Jan 2020 03:48:38 +0000 (03:48 +0000)]
Rootcanal: Always send FIRST_NON_AUTOMATICALLY_FLUSHABLE am: 32a732d317 am: ea7742dd18 am: 8be5e5c426

Change-Id: I3fedb176d275d30a4f97074c3186651cd4c33453

4 years agoAdd queuing for incoming acl packets am: abb03e7ba2 am: e4738764c9 am: acf11333fd
Automerger Merge Worker [Fri, 17 Jan 2020 03:48:12 +0000 (03:48 +0000)]
Add queuing for incoming acl packets am: abb03e7ba2 am: e4738764c9 am: acf11333fd

Change-Id: I0d25f0f90edda68736d3133036d63b489c367613

4 years agoMerge "PAN: Remove bta_pan_co_tx_writebuf (dead code)" am: 4ae2ed58df am: 1e12f9dd76...
Automerger Merge Worker [Fri, 17 Jan 2020 03:47:36 +0000 (03:47 +0000)]
Merge "PAN: Remove bta_pan_co_tx_writebuf (dead code)" am: 4ae2ed58df am: 1e12f9dd76 am: 69646b289c

Change-Id: Id0fe4f8455480dcff17b9beb460f98fc959daaee

4 years agoMerge "Delay removal of owned memory until close callback completes" am: 5fb434b0ac...
Automerger Merge Worker [Fri, 17 Jan 2020 03:47:01 +0000 (03:47 +0000)]
Merge "Delay removal of owned memory until close callback completes" am: 5fb434b0ac am: 09f3faf514 am: 5f685d15db

Change-Id: I5279e092e0838deb9087abe38576f76bf6013342

4 years agoAdd names for all shim modules am: e21efea454 am: a7fb255ed1 am: 9145020458
Automerger Merge Worker [Fri, 17 Jan 2020 03:46:02 +0000 (03:46 +0000)]
Add names for all shim modules am: e21efea454 am: a7fb255ed1 am: 9145020458

Change-Id: I74f9c0a6002406065be0841e5b858aa9cd6389bb

4 years agoRootcanal: Always send FIRST_NON_AUTOMATICALLY_FLUSHABLE am: 32a732d317 am: ea7742dd18
Automerger Merge Worker [Fri, 17 Jan 2020 03:39:19 +0000 (03:39 +0000)]
Rootcanal: Always send FIRST_NON_AUTOMATICALLY_FLUSHABLE am: 32a732d317 am: ea7742dd18

Change-Id: I8ab21b187e66f4b3b79282f3e1d6f40e5ac943b6

4 years agoAdd queuing for incoming acl packets am: abb03e7ba2 am: e4738764c9
Automerger Merge Worker [Fri, 17 Jan 2020 03:39:03 +0000 (03:39 +0000)]
Add queuing for incoming acl packets am: abb03e7ba2 am: e4738764c9

Change-Id: I4ac025a4ff603297e86e81c103f5fae47bfa9e88

4 years agoMerge "PAN: Remove bta_pan_co_tx_writebuf (dead code)" am: 4ae2ed58df am: 1e12f9dd76
Automerger Merge Worker [Fri, 17 Jan 2020 03:38:19 +0000 (03:38 +0000)]
Merge "PAN: Remove bta_pan_co_tx_writebuf (dead code)" am: 4ae2ed58df am: 1e12f9dd76

Change-Id: Iaf6b2e6d36a44147520fe9fe9e62c88bfa5181b1

4 years agoMerge "Delay removal of owned memory until close callback completes" am: 5fb434b0ac...
Automerger Merge Worker [Fri, 17 Jan 2020 03:37:31 +0000 (03:37 +0000)]
Merge "Delay removal of owned memory until close callback completes" am: 5fb434b0ac am: 09f3faf514

Change-Id: Id3bc58da135cdd1f4e993566c73820b51ca03dca

4 years agoAdd names for all shim modules am: e21efea454 am: a7fb255ed1
Automerger Merge Worker [Fri, 17 Jan 2020 03:35:43 +0000 (03:35 +0000)]
Add names for all shim modules am: e21efea454 am: a7fb255ed1

Change-Id: I39bb03d8f7ec57b5a37883fa15653d467c880878

4 years agoRootcanal: Always send FIRST_NON_AUTOMATICALLY_FLUSHABLE am: 32a732d317
Automerger Merge Worker [Fri, 17 Jan 2020 03:27:50 +0000 (03:27 +0000)]
Rootcanal: Always send FIRST_NON_AUTOMATICALLY_FLUSHABLE am: 32a732d317

Change-Id: Id154ad51546e2a208a9d14c02509581a3b5698a6

4 years agoAdd queuing for incoming acl packets am: abb03e7ba2
Automerger Merge Worker [Fri, 17 Jan 2020 03:27:15 +0000 (03:27 +0000)]
Add queuing for incoming acl packets am: abb03e7ba2

Change-Id: Iad49551a0b0f969f43aa20969a747e8aeb3f9a75

4 years agoMerge "PAN: Remove bta_pan_co_tx_writebuf (dead code)" am: 4ae2ed58df
Automerger Merge Worker [Fri, 17 Jan 2020 03:26:05 +0000 (03:26 +0000)]
Merge "PAN: Remove bta_pan_co_tx_writebuf (dead code)" am: 4ae2ed58df

Change-Id: I8421c0493f8a482a4e4c05a8328b8d9634292ca5

4 years agoMerge "Delay removal of owned memory until close callback completes" am: 5fb434b0ac
Automerger Merge Worker [Fri, 17 Jan 2020 03:24:37 +0000 (03:24 +0000)]
Merge "Delay removal of owned memory until close callback completes" am: 5fb434b0ac

Change-Id: I8b429070ab6a797e4c70bdc2253a343d108021b7

4 years agoAdd names for all shim modules am: e21efea454
Automerger Merge Worker [Fri, 17 Jan 2020 03:22:16 +0000 (03:22 +0000)]
Add names for all shim modules am: e21efea454

Change-Id: Iae4d73e3280a0e1373625553d9c9ca43dd9c8ab6

4 years agoLE-COC: Free LE-COC server resource when BluetoothServerSocket is closed
Jack He [Fri, 17 Jan 2020 00:20:06 +0000 (16:20 -0800)]
LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed

* When BluetoothServerSocket is closed in the Java layer, the native
  layer should respond by freeing all resources used by the server
  including file descriptors, structs, PSMs, and security IDs
* We did this correctly for BR_EDR L2CAP COC channels after
  I4e37dcd858af258fbd64fbfb2fbf0083bd743e06, but the same fix did not
  apply to LE COC
* This CL make sure LE COC server resources are freed propertly upon
  server fd closure

Test: open and close LE COC server repeatedly on an Android phone
Bug: 144148429
Change-Id: I16fa10e77612105d23848f71925ff6efc95bc75a

4 years agoRootcanal: Always send FIRST_NON_AUTOMATICALLY_FLUSHABLE
Hansong Zhang [Thu, 16 Jan 2020 23:11:22 +0000 (15:11 -0800)]
Rootcanal: Always send FIRST_NON_AUTOMATICALLY_FLUSHABLE

Controller should only send FIRST_NON_AUTOMATICALLY_FLUSHABLE to host
per spec 5.1 vol 2 part E 5.4.2

Test: run_cert.sh
Change-Id: Ia79a4a1d4e64de4ba0d59a44108db93e4a2f7c7a

4 years agoAdd queuing for incoming acl packets
Chris Manton [Thu, 16 Jan 2020 21:36:44 +0000 (13:36 -0800)]
Add queuing for incoming acl packets

If a second packet arrives to the acl while there is
already a packet being processed the code ASSERTS
with enqueue already registered.

Bug: 140778599
Test: Runs bt_headless for 100 runs with no errors

Change-Id: Ib7601eab2121b1888f58f71676f734080f41c8ec

4 years agoMerge "PAN: Remove bta_pan_co_tx_writebuf (dead code)"
Treehugger Robot [Thu, 16 Jan 2020 23:06:22 +0000 (23:06 +0000)]
Merge "PAN: Remove bta_pan_co_tx_writebuf (dead code)"

4 years agoMerge "Delay removal of owned memory until close callback completes"
Treehugger Robot [Thu, 16 Jan 2020 21:53:30 +0000 (21:53 +0000)]
Merge "Delay removal of owned memory until close callback completes"