OSDN Git Service

android-x86/system-bt.git
4 years agoMerge "L2CAP socket: Stop L2CAP server by ID instead of PSM"
Jack He [Wed, 29 Jan 2020 02:20:35 +0000 (18:20 -0800)]
Merge "L2CAP socket: Stop L2CAP server by ID instead of PSM"
am: 35c0cc14eb

Change-Id: Ia697096e48a0fb64e3f730cbbadc5c35d5c5264c

4 years agoMerge "L2CAP socket: Stop L2CAP server by ID instead of PSM"
Treehugger Robot [Wed, 29 Jan 2020 02:17:40 +0000 (02:17 +0000)]
Merge "L2CAP socket: Stop L2CAP server by ID instead of PSM"

4 years agoCert: Set default log_path_base
Hansong Zhang [Wed, 29 Jan 2020 01:16:26 +0000 (17:16 -0800)]
Cert: Set default log_path_base
am: afb14bc49d

Change-Id: I775a0deb2e8e26f7ff626489f6f7f87d89e56698

4 years agoL2CAP socket: Stop L2CAP server by ID instead of PSM
Jack He [Tue, 28 Jan 2020 03:33:45 +0000 (19:33 -0800)]
L2CAP socket: Stop L2CAP server by ID instead of PSM

* There could be multiple L2CAP socket control blocks with the same PSM
* The unique identifier for a L2CAP socket control block should be the
  unique ID allocated during control block initialization
* Use this ID to track L2CAP socket control block instead of PSM ensure
  that we close the correct socket
* Reset GAP handle and L2CAP socket ID to 0 when calling
  bta_jv_free_l2c_cb() so that disconnected L2CAP control blocks does
  not count

Test: CtsVerifier
Bug: 147997447
Bug: 144148429
Change-Id: Ideb428bc73aa0b36b8deb20fac280e44c8fe7db1

4 years agoCert: Set default log_path_base
Hansong Zhang [Tue, 28 Jan 2020 23:29:40 +0000 (15:29 -0800)]
Cert: Set default log_path_base

If ACTS failed to set configs.log_path, use /tmp/logs

Test: cert/run_cert_facade_only.sh
Change-Id: If3ddc15dc04fedcb23e87ff45c2bf81f537fa11a

4 years agoReduce logspam in AclManager am: 0aef0449ad
Automerger Merge Worker [Tue, 28 Jan 2020 20:01:13 +0000 (20:01 +0000)]
Reduce logspam in AclManager am: 0aef0449ad

Change-Id: I7368d9c67dba938b5e3eb8202e342caee6f955b2

4 years agoReduce logspam in AclManager
Jakub Pawlowski [Mon, 27 Jan 2020 15:21:12 +0000 (16:21 +0100)]
Reduce logspam in AclManager

Bug: 142341141
Test: receive long packet, verify next received packet doesn't print out
      "Dropping invalid packet" line.
Change-Id: I5bd2ecf4200ec030a26d0313a528ff51531d6688

4 years agoMerge "Move compiled grpc py to dist"
Hansong Zhang [Tue, 28 Jan 2020 03:36:40 +0000 (19:36 -0800)]
Merge "Move compiled grpc py to dist"
am: 4666fbaa86

Change-Id: Ibd2a5943f108ddd06816bf0551f3abd53fc49697

4 years agoMerge "Move compiled grpc py to dist"
Treehugger Robot [Tue, 28 Jan 2020 03:28:32 +0000 (03:28 +0000)]
Merge "Move compiled grpc py to dist"

4 years agoL2CAP Socket: Keep track of last allocated socket ID
Jack He [Tue, 28 Jan 2020 02:44:48 +0000 (18:44 -0800)]
L2CAP Socket: Keep track of last allocated socket ID
am: 79eda3270b

Change-Id: I65aafab76ca7c140e678e51f7272e7323dab0c0a

4 years agoL2CAP Socket: Keep track of last allocated socket ID
Jack He [Tue, 28 Jan 2020 01:09:17 +0000 (17:09 -0800)]
L2CAP Socket: Keep track of last allocated socket ID

* Keep track of last allocated socket ID in L2CAP socket stack
* Use last_sock_id + 1 as new IDs when allocating new socket blocks
* The de-dupe and overflow detection mechanism in btsock_l2cap_alloc_l()
  would handle the uint32_t overflow and duplicate ID cases

Test: CtsBluetoothTestCases
Bug: 144148429
Change-Id: Ieb9791ffa34eef919a32e4aff6f4b514859c69c0

4 years agoMove compiled grpc py to dist
Hansong Zhang [Tue, 28 Jan 2020 00:49:29 +0000 (16:49 -0800)]
Move compiled grpc py to dist

Currently we are using intermediate directory, which is unreliable.
Instead, zip all generated files and move it to dist target.

Add dist directory to temporary Python path, and run cert.

Bug: 148147248
Test: cert/run_cert.sh, cert/run_cert_facade_only.sh
Change-Id: I7daeb12247e3474ca4a4e20e94c20a7b83a21fad

4 years agoMerge "gd: Register close callback prior to channel acquire"
Chris Manton [Mon, 27 Jan 2020 22:24:54 +0000 (14:24 -0800)]
Merge "gd: Register close callback prior to channel acquire"
am: fcc62f8090

Change-Id: Ib2440215240eaaf2d394e401c6d39ebd1290c3d5

4 years agoMerge "gd: Register close callback prior to channel acquire"
Treehugger Robot [Mon, 27 Jan 2020 22:20:57 +0000 (22:20 +0000)]
Merge "gd: Register close callback prior to channel acquire"

4 years agoMerge "Remove unused HCI cert"
Hansong Zhang [Mon, 27 Jan 2020 21:56:41 +0000 (13:56 -0800)]
Merge "Remove unused HCI cert"
am: 0bc34a3b18

Change-Id: I391dfdb81b7fa11eced82ab21f82e8bde400e34c

4 years agoMerge "Remove unused HCI cert"
Treehugger Robot [Mon, 27 Jan 2020 21:52:30 +0000 (21:52 +0000)]
Merge "Remove unused HCI cert"

4 years agoMerge "Improve cert set up"
Hansong Zhang [Mon, 27 Jan 2020 21:40:42 +0000 (13:40 -0800)]
Merge "Improve cert set up"
am: 4879523ac4

Change-Id: Ic554f3cb1325314a9e3a16304adc1b99e5134cc4

4 years agoMerge "Improve cert set up"
Treehugger Robot [Mon, 27 Jan 2020 21:31:16 +0000 (21:31 +0000)]
Merge "Improve cert set up"

4 years agogd: Remove using directive from shim header file
Chris Manton [Mon, 27 Jan 2020 19:20:29 +0000 (11:20 -0800)]
gd: Remove using directive from shim header file
am: d605556a3b

Change-Id: I4c7c650eb6f341a7fb0b6777cc14def0937d56a9

4 years agoRemove unused HCI cert
Hansong Zhang [Fri, 24 Jan 2020 23:11:46 +0000 (15:11 -0800)]
Remove unused HCI cert

Test: cert/run_cert.sh
Change-Id: I48ce5068ea6f41b053ea5ac2be0441fbd44bca88

4 years agogd: Register close callback prior to channel acquire
Chris Manton [Mon, 27 Jan 2020 18:21:40 +0000 (10:21 -0800)]
gd: Register close callback prior to channel acquire

The underlying implementation enforces this with ASSERT

Bug: 144170448
Test: CtsVerifier HID host test
Change-Id: I65e023e4a523deb9a8aa8edd41a3592a600ffb8e

4 years agoImprove cert set up
Hansong Zhang [Fri, 24 Jan 2020 22:40:41 +0000 (14:40 -0800)]
Improve cert set up

Test: cert/run_cert.sh and cert/run_cert_facade_only.sh
Bug: 148147248
Change-Id: Ie8bddde7a7fe3b8c7f213be254645549115ec866

4 years agogd: Remove using directive from shim header file
Chris Manton [Mon, 27 Jan 2020 17:51:54 +0000 (09:51 -0800)]
gd: Remove using directive from shim header file

Bug:144170448
Test: bluetooth_test_legacy

Change-Id: I2c94aa18d4a993bbf5a198ae1a39e8065dc599c6

4 years agogd: Refactor how psms are un/registered in shim
Chris Manton [Mon, 27 Jan 2020 06:05:47 +0000 (22:05 -0800)]
gd: Refactor how psms are un/registered in shim
am: 5dc119a0a7

Change-Id: I84bec6b9315c70c76458fe52f4147209213c98a3

4 years agogd: Refactor how psms are un/registered in shim
Chris Manton [Fri, 24 Jan 2020 22:13:33 +0000 (14:13 -0800)]
gd: Refactor how psms are un/registered in shim

Bug:144170448
Test: CtsVerifier install/remove verifier PSM services

Change-Id: I3849bb60c308cf9a7cda56aec8978e9ede3f3787

4 years agoCert: Append to Python path in command only
Hansong Zhang [Sat, 25 Jan 2020 00:20:59 +0000 (16:20 -0800)]
Cert: Append to Python path in command only
am: 5057dc59ae

Change-Id: I3d086bdbaaa975624c6fbccae9ac63d601b7c3f9

4 years agoAdd bluetooth_packets_python3 and proto to zip
Hansong Zhang [Sat, 25 Jan 2020 00:15:45 +0000 (16:15 -0800)]
Add bluetooth_packets_python3 and proto to zip
am: d9d0cb497e

Change-Id: I6c8b77085c7e9502f1870fc8ed93856a8eceab8c

4 years agoCert: Append to Python path in command only
Hansong Zhang [Fri, 24 Jan 2020 22:17:05 +0000 (14:17 -0800)]
Cert: Append to Python path in command only

Test: cert/run_cert.sh and cert/run_cert_facade_only.sh
Bug: 148147248
Change-Id: I828d6d38d1338a730b303ebf090c6b7706211371

4 years agoAdd bluetooth_packets_python3 and proto to zip
Hansong Zhang [Fri, 24 Jan 2020 21:40:32 +0000 (13:40 -0800)]
Add bluetooth_packets_python3 and proto to zip

Bug: 148147248
Test: make
Change-Id: I981b1a171538ab5ff47ac59a6bfda0472b8cbe69

4 years agoMerge "gd shim l2cap_test"
Chris Manton [Fri, 24 Jan 2020 21:08:15 +0000 (13:08 -0800)]
Merge "gd shim l2cap_test"
am: 1140f7bd22

Change-Id: I3c5b063ddd81c808d5955c773c891880ece86380

4 years agoMerge "gd shim l2cap_test"
Treehugger Robot [Fri, 24 Jan 2020 20:17:06 +0000 (20:17 +0000)]
Merge "gd shim l2cap_test"

4 years agogd shim l2cap_test
Chris Manton [Thu, 23 Jan 2020 00:34:35 +0000 (16:34 -0800)]
gd shim l2cap_test

Also avoid holding a memory in unique_ptr

Bug: 146086425
Test: bluetooth_test_gd

Change-Id: I23ac9eaced5f2426b26cd7fb0d041adf578315d0

4 years agoAdd device artifacts to bluetooth_cert_test.zip
Hansong Zhang [Fri, 24 Jan 2020 19:04:53 +0000 (11:04 -0800)]
Add device artifacts to bluetooth_cert_test.zip
am: c4b7de7cb0

Change-Id: Ib548753ec9d55e40ba821274e3daf9129a00ae08

4 years agoAdd device artifacts to bluetooth_cert_test.zip
Hansong Zhang [Fri, 24 Jan 2020 18:10:10 +0000 (10:10 -0800)]
Add device artifacts to bluetooth_cert_test.zip

Test: m dist bluetooth_stack_with_facade
Change-Id: I08d722e21300c8a3bfcb393c3a9ec1cefe22d8e2

4 years agoAdd required binaries to zip file am: 6f4866ea91
Automerger Merge Worker [Thu, 23 Jan 2020 23:32:36 +0000 (23:32 +0000)]
Add required binaries to zip file am: 6f4866ea91

Change-Id: I2f5be3a12627819bf6414f0d293b00638d99f427

4 years agoAdd required binaries to zip file
Hansong Zhang [Thu, 23 Jan 2020 21:44:33 +0000 (13:44 -0800)]
Add required binaries to zip file

Bug: 148147248
Test: build
Change-Id: I87b96b05975ae9e66fb1fd78d185f911b809706c

4 years agoUse bluetooth_stack_with_facade as dist target
Hansong Zhang [Thu, 23 Jan 2020 21:14:21 +0000 (13:14 -0800)]
Use bluetooth_stack_with_facade as dist target
am: 5298d9ffa3

Change-Id: I7195a966fe0458ce311ea42899d490d218df804a

4 years agoUse bluetooth_stack_with_facade as dist target
Hansong Zhang [Wed, 22 Jan 2020 00:03:53 +0000 (16:03 -0800)]
Use bluetooth_stack_with_facade as dist target

And let bluetooth_stack_with_facade require root-canal

Test: m dist bluetooth_stack_with_facade -j50
Bug: 148147248
Change-Id: I6b4651042cb6bb5769d96575ac61a8f192381d3c

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
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 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"
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"
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 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 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
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"
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
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"
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"
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"
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
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: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 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
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"

4 years agoDelay removal of owned memory until close callback completes
Chris Manton [Thu, 16 Jan 2020 19:25:06 +0000 (11:25 -0800)]
Delay removal of owned memory until close callback completes

Bug: 146086425
Test: bt_headless runs many (~100) iterations without this signature failure
Change-Id: I96a59ca80cf15ca0248e6ef2a0a2f1dcaf5c9fea

4 years agoMerge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage...
TreeHugger Robot [Thu, 16 Jan 2020 18:29:12 +0000 (18:29 +0000)]
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master

4 years agoAdd names for all shim modules
Chris Manton [Thu, 16 Jan 2020 17:53:17 +0000 (09:53 -0800)]
Add names for all shim modules

Bug: 140778599
Test: bluetooth_test_gd
Change-Id: Ie55ab28a5b1d748053c48835b2c9d7b855ede750

4 years agoMerge "AclManager::create_le_connection fixes"
Jakub Pawlowski [Thu, 16 Jan 2020 15:01:19 +0000 (07:01 -0800)]
Merge "AclManager::create_le_connection fixes"
am: 963735ccd5

Change-Id: I26baea07133e0b67b2fcb73f2f59359b0cd5df97

4 years agoMerge "AclManager::create_le_connection fixes"
Jakub Pawlowski [Thu, 16 Jan 2020 14:55:42 +0000 (14:55 +0000)]
Merge "AclManager::create_le_connection fixes"

4 years agoMerge "Convert on-device tests to facade_only"
Myles Watson [Thu, 16 Jan 2020 14:09:00 +0000 (06:09 -0800)]
Merge "Convert on-device tests to facade_only"
am: 83646936f2

Change-Id: Id54aafc0067615bfcc42ccbe0fcc4f71add7ad89

4 years agoMerge "Convert on-device tests to facade_only"
Treehugger Robot [Thu, 16 Jan 2020 14:07:39 +0000 (14:07 +0000)]
Merge "Convert on-device tests to facade_only"

4 years agoMerge "SecurityManager: Call Init in the constructor"
Myles Watson [Thu, 16 Jan 2020 14:05:19 +0000 (06:05 -0800)]
Merge "SecurityManager: Call Init in the constructor"
am: b09d920e59

Change-Id: I0121013ebe7c6421e2ff4e3d8748e26115284a94