OSDN Git Service

android-x86/system-bt.git
4 years agoBluetoothMetricid: Add metric allocator api in java
Chen Chen [Thu, 5 Mar 2020 23:02:46 +0000 (15:02 -0800)]
BluetoothMetricid: Add metric allocator api in java

Bug: 142563377
Test: Manual atest AdapterServiceTest

Change-Id: I46d1c1d5bf0c8beea1f46b1024cbd5ceb9c0b562
Merged-In: I46d1c1d5bf0c8beea1f46b1024cbd5ceb9c0b562

4 years agoMerge "L2capTest: Remove unused classic facade"
Treehugger Robot [Thu, 5 Mar 2020 22:27:50 +0000 (22:27 +0000)]
Merge "L2capTest: Remove unused classic facade"

4 years agoMerge "BluetoothMetrics: Implement and test metric_id_allocator and lru"
Chen Chen [Thu, 5 Mar 2020 20:58:57 +0000 (20:58 +0000)]
Merge "BluetoothMetrics: Implement and test metric_id_allocator and lru"

4 years agoL2capTest: Remove unused classic facade
Hansong Zhang [Thu, 5 Mar 2020 20:22:53 +0000 (12:22 -0800)]
L2capTest: Remove unused classic facade

Test: cert/run --host
Change-Id: Id60428b7491123de02b8dff17d28c7e2f6a6d94d

4 years agoMerge stage-aosp-master to aosp-master - DO NOT MERGE
Bill Yi [Thu, 5 Mar 2020 17:51:37 +0000 (09:51 -0800)]
Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: I7a18fc2613aeb4a0a8b6d5e81b1985bfaa117540

4 years agoOS Queue and Reactor: Minor fixes
Hansong Zhang [Wed, 4 Mar 2020 21:55:09 +0000 (13:55 -0800)]
OS Queue and Reactor: Minor fixes

* When deleting EnqueueBuffer, unregister if needed
* Add a mutex to Reactor::WaitForUnregisteredReactable to prevent from
potential race
* EnqueueBuffer: Use an atomic_bool to synchronize Register/Unregister

Bug: 150174451
Test: cert/run --device
Change-Id: I7abcc2f763f8f0575dc0c67141571904c9a20136

4 years agoMerge "Cert: Unzip all cert files into the same virtual environment" am: d03c48a520
Automerger Merge Worker [Thu, 5 Mar 2020 17:28:22 +0000 (17:28 +0000)]
Merge "Cert: Unzip all cert files into the same virtual environment" am: d03c48a520

Change-Id: Iaeded4e112ad91e69ac8c040490256193bd66741

4 years agoMerge "Cert: Unzip all cert files into the same virtual environment"
Treehugger Robot [Thu, 5 Mar 2020 17:16:56 +0000 (17:16 +0000)]
Merge "Cert: Unzip all cert files into the same virtual environment"

4 years agoHCI: Add packet definitions from 5.2 spec am: 2800f01798
Automerger Merge Worker [Thu, 5 Mar 2020 14:40:24 +0000 (14:40 +0000)]
HCI: Add packet definitions from 5.2 spec am: 2800f01798

Change-Id: Ib944a6ac4c9274bd5c9db18d6fa00d8b88ea5eab

4 years agoCert: Unzip all cert files into the same virtual environment
Jack He [Thu, 5 Mar 2020 11:41:22 +0000 (03:41 -0800)]
Cert: Unzip all cert files into the same virtual environment

* All Python import must root from system/bt/gd
* Include all .py files in system/bt/gd in bluetooth_cert_test.zip
* At runtime, unzip all cert files into the same bluetooth_cert_test_env
  folder so that generated files and developer written files are
  overlayed together
* This helps avoid duplicate module problem at runtime

Bug: 150321998
Test: source cert/run --host
Change-Id: I7a8b1fe9fbccae1b1b4e8bf31a759a1c1eb7475c

4 years agoHCI: Add packet definitions from 5.2 spec
Jakub Pawlowski [Tue, 3 Mar 2020 10:31:46 +0000 (11:31 +0100)]
HCI: Add packet definitions from 5.2 spec

Bug: 150669615
Test: compilation
Change-Id: I7d7bbfa93fd0f3df3c4df35881ab53f3a6ea9c51

4 years agoFix L2CAP Cert and AclManagerFacade am: 5b735ba9d4
Automerger Merge Worker [Thu, 5 Mar 2020 02:37:22 +0000 (02:37 +0000)]
Fix L2CAP Cert and AclManagerFacade am: 5b735ba9d4

Change-Id: I73665cb46e8a8844fcb7b4a39957bfc5dc72aef4

4 years agoFix on device L2capTest am: 6d0c1f93a5
Automerger Merge Worker [Thu, 5 Mar 2020 02:37:20 +0000 (02:37 +0000)]
Fix on device L2capTest am: 6d0c1f93a5

Change-Id: Ibf0a696bd3544372909383f880d24e430ecbec3a

4 years agoHCI: Synchronize ACL Queue am: b708a906f3
Automerger Merge Worker [Thu, 5 Mar 2020 01:00:05 +0000 (01:00 +0000)]
HCI: Synchronize ACL Queue am: b708a906f3

Change-Id: I83d72c5e88f455d780deb030b6cf45641f07eaf4

4 years agoFix L2CAP Cert and AclManagerFacade
Hansong Zhang [Wed, 4 Mar 2020 23:03:26 +0000 (15:03 -0800)]
Fix L2CAP Cert and AclManagerFacade

* Store RetransmissionAndFlowControlMode from remote config request
* Send correct config request from cert
* SendAclPacket: Hold lock until packet has been dequeued to avoid
  double RegisterEnqueue

Test: cert/run --device
Bug: 150174451
Change-Id: I2c31f336a19d4a3e1e05efb56c20b9e4dbdd98a7

4 years agoFix on device L2capTest
Hansong Zhang [Wed, 4 Mar 2020 21:57:03 +0000 (13:57 -0800)]
Fix on device L2capTest

* Synchronize between Queue callback context and module handler context
* Synchronize between Stop() and Queue callback context
* Fix DataPipelineManager channel registration logic with
  SignallingManager

Bug: 150174451
Test: cert/run --device
Change-Id: If58dcb5b0cc400f9c9ed1bbc6ec2c01de52789b2

4 years agoHCI: Synchronize ACL Queue
Hansong Zhang [Wed, 4 Mar 2020 21:52:20 +0000 (13:52 -0800)]
HCI: Synchronize ACL Queue

* Synchronize Queue registration with Module Handler and Stop()
* Synchronize UnregisterCompletedAclPacketsCallback() as this is invoked
  during Stop()
* Add a timeout in AclManagerFacade to prevent from deadlock

Bug: 150174451
Test: cert/run --device
Change-Id: I3a476af54aaa57e25a7fd51089b44954ae574dc6

4 years agoMinor improvements to Module, Reactor, StackManager am: 25ab0d1206
Automerger Merge Worker [Wed, 4 Mar 2020 21:24:25 +0000 (21:24 +0000)]
Minor improvements to Module, Reactor, StackManager am: 25ab0d1206

Change-Id: Iadc2bd7a1826cae5c808cd8e3c65b12beb4cedee

4 years agoFix NeighborTest am: 7ff79a3e50
Automerger Merge Worker [Wed, 4 Mar 2020 21:24:09 +0000 (21:24 +0000)]
Fix NeighborTest am: 7ff79a3e50

Change-Id: Id4d0978e1cfd5587f120c6f7615874fec5463dcc

4 years agoMinor improvements to Module, Reactor, StackManager
Hansong Zhang [Tue, 3 Mar 2020 23:05:34 +0000 (15:05 -0800)]
Minor improvements to Module, Reactor, StackManager

Add some logs. Fix the timeout in StackManager because some systems are
slow.

Test: bluetooth_test_gd
Change-Id: Idd3f0b14fd66dde250eadc84c1d5cad10664154d

4 years agoFix NeighborTest
Hansong Zhang [Tue, 3 Mar 2020 23:01:34 +0000 (15:01 -0800)]
Fix NeighborTest

Test: cert/run --host
Change-Id: I2c7296817e95cc2711360f310515afb1d4f7d909

4 years agoBluetoothMetrics: Implement and test metric_id_allocator and lru
Chen Chen [Thu, 20 Feb 2020 19:29:42 +0000 (11:29 -0800)]
BluetoothMetrics: Implement and test metric_id_allocator and lru

Test: run atest on unittests
Bug: 142563377

Change-Id: I05739258479a67d47550a6cb1db1c6f8c1ff3e98

4 years agoMerge "Cert: Do not use ANDROID_ build environment variables in test" am: e9c391e7b8
Automerger Merge Worker [Wed, 4 Mar 2020 05:25:03 +0000 (05:25 +0000)]
Merge "Cert: Do not use ANDROID_ build environment variables in test" am: e9c391e7b8

Change-Id: I861b9ad8f674d45feb1071444fcb4458cae41365

4 years agoMerge "Cert: Do not use ANDROID_ build environment variables in test"
Treehugger Robot [Wed, 4 Mar 2020 05:11:36 +0000 (05:11 +0000)]
Merge "Cert: Do not use ANDROID_ build environment variables in test"

4 years agoMerge changes I099e53e6,Icab0e0d7,Ic8b73158,I989b35eb,Ie3bf7c90, ... am: cc80ee299b
Automerger Merge Worker [Wed, 4 Mar 2020 01:05:17 +0000 (01:05 +0000)]
Merge changes I099e53e6,Icab0e0d7,Ic8b73158,I989b35eb,Ie3bf7c90, ... am: cc80ee299b

Change-Id: I72adfd873b9794c41ac5f3c3ef21c8a892617df4

4 years agoMerge changes I099e53e6,Icab0e0d7,Ic8b73158,I989b35eb,Ie3bf7c90, ...
Zach Johnson [Wed, 4 Mar 2020 00:54:11 +0000 (00:54 +0000)]
Merge changes I099e53e6,Icab0e0d7,Ic8b73158,I989b35eb,Ie3bf7c90, ...

* changes:
  Assorted cleanup
  Simplify disconnect for cert channels
  Simplify sending information requests
  Add information response matchers
  Move dut & cert channels into return result
  Use multi-match in a few places where it makes sense
  Add function to send s_frames & clean up sending
  Rename L2capMatchers.InformationFrame & SupervisoryFrame
  Distingiush between validated and unvalidated channels open
  Simplify channel open, so it can fit on one line
  Migrate i frame sending into CertL2cap
  Start migrating to channel abstractions
  Make ertm & fcs separable, reduce redundant code
  Add function to simplify sending control packets

4 years agoCert: Do not use ANDROID_ build environment variables in test
Jack He [Tue, 3 Mar 2020 23:39:37 +0000 (15:39 -0800)]
Cert: Do not use ANDROID_ build environment variables in test

* Various environment variables should come from the build artifacts
  instead of the running environment.
* Hence getting rid of varioud usage of ANDROID_* variables in test
  files and figure them out through build artifacts
* Generate environment_provider.py at build time to provide
  build specific variables to the test at run time

Test: source cert/run
Bug: 150321998
Change-Id: I783c3784ad6018cb807a46701675fa5307e39175

4 years agoQueue: Wait for unregistration if on different thread am: 4813536675
Automerger Merge Worker [Tue, 3 Mar 2020 23:33:00 +0000 (23:33 +0000)]
Queue: Wait for unregistration if on different thread am: 4813536675

Change-Id: Iee6c21432077bcd345723efdbe59432fbac88db6

4 years agoAssorted cleanup
Zach Johnson [Tue, 3 Mar 2020 21:54:34 +0000 (13:54 -0800)]
Assorted cleanup

Hide methods that are only used internally, remove unused ones, etc.

Test: cert/run --host --test_filter=L2capTest
Change-Id: I099e53e6b9f1d229fdc1ee14b30d66e27c2c7a09

4 years agoSimplify disconnect for cert channels
Zach Johnson [Tue, 3 Mar 2020 21:45:58 +0000 (13:45 -0800)]
Simplify disconnect for cert channels

Test: cert/run --host --test_filter=L2capTest
Change-Id: Icab0e0d7e356ae228c3125e452c93ad057be6074

4 years agoSimplify sending information requests
Zach Johnson [Tue, 3 Mar 2020 21:31:01 +0000 (13:31 -0800)]
Simplify sending information requests

Test: cert/run --host --test_filter=L2capTest
Change-Id: Ic8b731582ad2087922c18c06ad40e0319ae80b99

4 years agoAdd information response matchers
Zach Johnson [Tue, 3 Mar 2020 20:43:04 +0000 (12:43 -0800)]
Add information response matchers

Test: cert/run --host --test_filter=L2capTest
Change-Id: I989b35eb6ed05f1d845d332e238a44eb136f966a

4 years agoMove dut & cert channels into return result
Zach Johnson [Tue, 3 Mar 2020 19:59:43 +0000 (11:59 -0800)]
Move dut & cert channels into return result

Simplfies access in tests (no self. prefix) and
is also less like global variables.

Test: cert/run --host --test_filter=L2capTest
Change-Id: Ie3bf7c9039a6018f16a587dab542b3d8f88781cc

4 years agoUse multi-match in a few places where it makes sense
Zach Johnson [Tue, 3 Mar 2020 19:36:07 +0000 (11:36 -0800)]
Use multi-match in a few places where it makes sense

Test: cert/run --host --test_filter=L2capTest
Change-Id: I8fa955ef15c36d8b3c91c9a7d97289741d08fa96

4 years agoAdd function to send s_frames & clean up sending
Zach Johnson [Tue, 3 Mar 2020 19:25:37 +0000 (11:25 -0800)]
Add function to send s_frames & clean up sending

Test: cert/run --host --test_filter=L2capTest
Change-Id: I3bc7d2f0489a8a99febbc7bf746f355a2c77223d

4 years agoRename L2capMatchers.InformationFrame & SupervisoryFrame
Zach Johnson [Tue, 3 Mar 2020 19:02:26 +0000 (11:02 -0800)]
Rename L2capMatchers.InformationFrame & SupervisoryFrame

Use IFrame and SFrame, to match the sending functions on channel
Test: cert/run --host --test_filter=L2capTest

Change-Id: I4d75e59b570a32ad2d8005a1365156025b2f4416

4 years agoDistingiush between validated and unvalidated channels open
Zach Johnson [Tue, 3 Mar 2020 18:55:08 +0000 (10:55 -0800)]
Distingiush between validated and unvalidated channels open

Since the common case is a validated channel, push the response
validation into _open_channel so we don't need to repeat it
in the test function.

Create _open_unvalidated_channel, so tests that need to do
custom validation off the common path can do so.

Test: cert/run --host --test_filter=L2capTest
Change-Id: Ic4c7d74109c23486e0862b7eca38f62cb8469228

4 years agoFix RepeatingAlarmTest am: b0e3826ac4
Automerger Merge Worker [Tue, 3 Mar 2020 21:37:03 +0000 (21:37 +0000)]
Fix RepeatingAlarmTest am: b0e3826ac4

Change-Id: Ib3a6ea5594602feffbc4590d21c55b4dc82c2e22

4 years agoQueue: Wait for unregistration if on different thread
Hansong Zhang [Tue, 3 Mar 2020 20:43:23 +0000 (12:43 -0800)]
Queue: Wait for unregistration if on different thread

Before Queue object is deleted, we must make sure that the enqueue or
dequeue callback isn't executing. If on same thread, callbacks are
synchronized. If on different thread, we must wait for unregistration to
synchronize callbacks.

Test: bluetooth_test_gd
Bug: 150174451
Change-Id: Id3c980aa0bf7bd9fa10c33c5cca3751df38f7d97

4 years agoFix RepeatingAlarmTest
Hansong Zhang [Tue, 3 Mar 2020 21:02:03 +0000 (13:02 -0800)]
Fix RepeatingAlarmTest

We may not be cancel the alarm within 1 millisecond for some machine.
Make it a bit longer.

Test: bluetooth_test_gd
Change-Id: Ia0eae89b8022d41281db55c152dbb748332f2dee

4 years agoSimplify channel open, so it can fit on one line
Zach Johnson [Tue, 3 Mar 2020 18:22:42 +0000 (10:22 -0800)]
Simplify channel open, so it can fit on one line

Test: cert/run --host --test_filter=L2capTest
Change-Id: I377a313008465b725991433158e5c828c8568cf3

4 years agoMigrate i frame sending into CertL2cap
Zach Johnson [Tue, 3 Mar 2020 17:32:01 +0000 (09:32 -0800)]
Migrate i frame sending into CertL2cap

Test: cert/run --host --test_filter=L2capTest
Change-Id: I4af9e1576741b77d8cd24aa4852ee868660be688

4 years agoMerge "Start CertL2cap, an abstraction to make L2cap testing simpler" am: a9017fae2b
Automerger Merge Worker [Tue, 3 Mar 2020 17:14:18 +0000 (17:14 +0000)]
Merge "Start CertL2cap, an abstraction to make L2cap testing simpler" am: a9017fae2b

Change-Id: I3390b0353ab77967be2eb854f007fa4f6d41e052

4 years agoMerge "Start CertL2cap, an abstraction to make L2cap testing simpler"
Treehugger Robot [Tue, 3 Mar 2020 17:05:41 +0000 (17:05 +0000)]
Merge "Start CertL2cap, an abstraction to make L2cap testing simpler"

4 years agoMerge "SecurityModule: Restructure L2CAP connections" am: 5f7aca01ef
Automerger Merge Worker [Tue, 3 Mar 2020 08:03:37 +0000 (08:03 +0000)]
Merge "SecurityModule: Restructure L2CAP connections" am: 5f7aca01ef

Change-Id: I2b931ac4509299b3a048565edd8471ab81b16034

4 years agoMerge "SecurityModule: Restructure L2CAP connections"
Treehugger Robot [Tue, 3 Mar 2020 07:41:24 +0000 (07:41 +0000)]
Merge "SecurityModule: Restructure L2CAP connections"

4 years agoMerge "User "return" instead of "exit" in shell scripts" am: fc069c7c07
Automerger Merge Worker [Tue, 3 Mar 2020 06:38:37 +0000 (06:38 +0000)]
Merge "User "return" instead of "exit" in shell scripts" am: fc069c7c07

Change-Id: Ib6a6d621c7c39a152a3acab43fb50cede1a86fad

4 years agoMerge "User "return" instead of "exit" in shell scripts"
Treehugger Robot [Tue, 3 Mar 2020 06:30:14 +0000 (06:30 +0000)]
Merge "User "return" instead of "exit" in shell scripts"

4 years agoStart migrating to channel abstractions
Zach Johnson [Tue, 3 Mar 2020 04:30:36 +0000 (20:30 -0800)]
Start migrating to channel abstractions

Filter out packets by channel id, so matchers don't have to
know about them and tests can be clearer.

Test: cert/run --host --test_filter=L2capTest
Change-Id: Id2a749f3b3b543a8b5a9a17c8db16cb97f447a33

4 years agoMake ertm & fcs separable, reduce redundant code
Zach Johnson [Mon, 2 Mar 2020 22:49:22 +0000 (14:49 -0800)]
Make ertm & fcs separable, reduce redundant code

Test: cert/run --host --test_filter=L2capTest
Change-Id: I15a14ed794000e0fd9986ef4bfc73135a6d38e36

4 years agoAdd function to simplify sending control packets
Zach Johnson [Mon, 2 Mar 2020 22:41:18 +0000 (14:41 -0800)]
Add function to simplify sending control packets

Test: cert/run --host --test_filter=L2capTest
Change-Id: Id2e0d1221d31711d1170a6a438208cc565a88da7

4 years agoStart CertL2cap, an abstraction to make L2cap testing simpler
Zach Johnson [Mon, 2 Mar 2020 21:11:33 +0000 (13:11 -0800)]
Start CertL2cap, an abstraction to make L2cap testing simpler

Will contain all the l2cap logic, to make the test files
just the important, simple expression of tests rather than
all the support to run a layer.

Test: cert/run --host --test_filter=L2capTest
Change-Id: Ic880d3f936daccad37fb77521b9240028047ca44

4 years agoMerge changes Ib5197ec5,I9a155234 am: 053c2e3499
Automerger Merge Worker [Tue, 3 Mar 2020 04:02:05 +0000 (04:02 +0000)]
Merge changes Ib5197ec5,I9a155234 am: 053c2e3499

Change-Id: Ie2edb7d7f6d2db2b8f8aabd023ba29718560e8a1

4 years agoMerge changes Ib5197ec5,I9a155234
Treehugger Robot [Tue, 3 Mar 2020 03:42:00 +0000 (03:42 +0000)]
Merge changes Ib5197ec5,I9a155234

* changes:
  gd: pts test L2CAP/COS/CFD/BV-05-C
  gd: pts test L2CAP/COS/CFD/BV-02-C

4 years agoMerge "gd: pts test L2CAP/COS/CFD/BV-12-C" am: e3b3461d8a
Automerger Merge Worker [Tue, 3 Mar 2020 02:37:34 +0000 (02:37 +0000)]
Merge "gd: pts test L2CAP/COS/CFD/BV-12-C" am: e3b3461d8a

Change-Id: I907126c712b3e2628b4017089c3001256360f5a8

4 years agoL2CAP: Minor fixes am: ce6a13a6cb
Automerger Merge Worker [Tue, 3 Mar 2020 02:37:27 +0000 (02:37 +0000)]
L2CAP: Minor fixes am: ce6a13a6cb

Change-Id: Iba3489f48835334cb00fcb34382adebb914bb7cd

4 years agoMerge "gd: pts test L2CAP/COS/CFD/BV-12-C"
Treehugger Robot [Tue, 3 Mar 2020 02:32:13 +0000 (02:32 +0000)]
Merge "gd: pts test L2CAP/COS/CFD/BV-12-C"

4 years agoModule: Increase StopTimeout to 2000 ms am: cfab6b48ab
Automerger Merge Worker [Tue, 3 Mar 2020 02:01:09 +0000 (02:01 +0000)]
Module: Increase StopTimeout to 2000 ms am: cfab6b48ab

Change-Id: Iad1165907e55b1ac8a05ec89326d6afe818e60b9

4 years agoUser "return" instead of "exit" in shell scripts
Jack He [Tue, 3 Mar 2020 01:31:44 +0000 (17:31 -0800)]
User "return" instead of "exit" in shell scripts

* Exit will cause the parent terminal to exit

Test: source cert/set_up_and_run_device_cert.sh --help
Change-Id: I07005a5a3d12f1c01429f7fb70946f2c39a942b9

4 years agoL2CAP: Minor fixes
Hansong Zhang [Tue, 3 Mar 2020 00:09:01 +0000 (16:09 -0800)]
L2CAP: Minor fixes

* Change some data member order to their correct dependency
* Use atomic_bool to indicate some queue registration state
* Synchronize DataController::OnSdu on L2cap Handler context

Bug: 150174451
Test: cert/run --host
Change-Id: Ifb1313c98267d4e47460e28b4ba167610203ba11

4 years agogd: pts test L2CAP/COS/CFD/BV-12-C
Chris Manton [Mon, 2 Mar 2020 22:26:58 +0000 (14:26 -0800)]
gd: pts test L2CAP/COS/CFD/BV-12-C

Bug: 150635625
Test: ./gd/cert/run --host --test_filter=L2capTest
Change-Id: I8341b3b6f8a6da0f142bad20b79f7495662d2ba6

4 years agogd: pts test L2CAP/COS/CFD/BV-05-C
Chris Manton [Mon, 2 Mar 2020 23:03:10 +0000 (15:03 -0800)]
gd: pts test L2CAP/COS/CFD/BV-05-C

Bug: 150637813
Test: ./gd/cert/run --host  --test_filter=L2capTest

Change-Id: Ib5197ec5a657d21bb78104ee4280ed6222995a46

4 years agogd: pts test L2CAP/COS/CFD/BV-02-C
Chris Manton [Mon, 2 Mar 2020 22:55:33 +0000 (14:55 -0800)]
gd: pts test L2CAP/COS/CFD/BV-02-C

Bug: 150638104
Test: ./gd/cert/run --host --test_filter=L2capTest
Change-Id: I9a15523474885ae2f1f7d1a77301613b5a4b8a9e

4 years agoMerge changes Ib9f7e800,Ife714ad8,I9f73cf16,I6879d056,Ia180ec59, ... am: 34efa65819
Automerger Merge Worker [Mon, 2 Mar 2020 23:27:41 +0000 (23:27 +0000)]
Merge changes Ib9f7e800,Ife714ad8,I9f73cf16,I6879d056,Ia180ec59, ... am: 34efa65819

Change-Id: I7a992caaf2316ab5b6d4a949c4aa9f96e69343e1

4 years agoMerge "GD SMP: Fix logic error in picking dialog type" am: 2fcfaca906
Automerger Merge Worker [Mon, 2 Mar 2020 23:27:12 +0000 (23:27 +0000)]
Merge "GD SMP: Fix logic error in picking dialog type" am: 2fcfaca906

Change-Id: I92fa7b06e84f4b3ea49b742b15190aa5444584f8

4 years agoModule: Increase StopTimeout to 2000 ms
Hansong Zhang [Mon, 2 Mar 2020 23:05:53 +0000 (15:05 -0800)]
Module: Increase StopTimeout to 2000 ms

We need to expect longer time, because we need to wait for Queue
unregistration (next patch) to be done during module shutdown

Bug: 150174451
Bug: 150054218
Test: bluetooth_test_gd
Change-Id: If8a45b2df2f2210884e0901029c151c80fab0684

4 years agoSecurityModule: Restructure L2CAP connections
Martin Brabham [Wed, 19 Feb 2020 01:01:02 +0000 (17:01 -0800)]
SecurityModule: Restructure L2CAP connections

Move L2CAP specifics for classic into the SecurityManagerChannel

Bug:
Test: bluetooth_test_gd --gtest_filter=ClassicPairingHandlerTest*
Change-Id: I5a891e560ed6a2f029bd0fcf22cdde419ea8a34c

4 years agoMerge changes Ib9f7e800,Ife714ad8,I9f73cf16,I6879d056,Ia180ec59, ...
Zach Johnson [Mon, 2 Mar 2020 22:22:39 +0000 (22:22 +0000)]
Merge changes Ib9f7e800,Ife714ad8,I9f73cf16,I6879d056,Ia180ec59, ...

* changes:
  Migrate remaining event stream asserts in L2capTest to truth
  Migrate information frames to matchers
  Migrate supervisory frame matching logic
  Replace a few more matchers
  Migrate connection response to L2capMatchers
  Start migrating l2cap packet matchers to their own file
  Fix config request/response order comments
  Replace hardcoded control packet handling with lookup table

4 years agoMerge "GD SMP: Fix logic error in picking dialog type"
Treehugger Robot [Mon, 2 Mar 2020 22:17:20 +0000 (22:17 +0000)]
Merge "GD SMP: Fix logic error in picking dialog type"

4 years agoMerge changes I5578a52e,I36446c92 am: 769afdc92e
Automerger Merge Worker [Mon, 2 Mar 2020 20:31:58 +0000 (20:31 +0000)]
Merge changes I5578a52e,I36446c92 am: 769afdc92e

Change-Id: I433a494bf6d17ee2f158b07192091020aafaa942

4 years agoMerge changes Iafd263c7,I29300b6b,If8422986,Ied877cd6,If30d8ca4, ... am: 474448a3b6
Automerger Merge Worker [Mon, 2 Mar 2020 20:31:51 +0000 (20:31 +0000)]
Merge changes Iafd263c7,I29300b6b,If8422986,Ied877cd6,If30d8ca4, ... am: 474448a3b6

Change-Id: I6c55bf27e266c7cee4659f3ed5cea112084fdc84

4 years agoMerge "Add PyHciAclConnection" am: 96e90104d0
Automerger Merge Worker [Mon, 2 Mar 2020 20:31:43 +0000 (20:31 +0000)]
Merge "Add PyHciAclConnection" am: 96e90104d0

Change-Id: Iad128e68abfbbb2a54251570bda807f31b08e254

4 years agoMerge changes If61ab95a,Id9b7d89a am: 6d5cc4b79c
Automerger Merge Worker [Mon, 2 Mar 2020 20:31:23 +0000 (20:31 +0000)]
Merge changes If61ab95a,Id9b7d89a am: 6d5cc4b79c

Change-Id: I0399f032287670b094f4ba7a276492c3052e6ae8

4 years agoMerge changes I5578a52e,I36446c92
Treehugger Robot [Mon, 2 Mar 2020 20:16:08 +0000 (20:16 +0000)]
Merge changes I5578a52e,I36446c92

* changes:
  Simplify packet parsing/filtering for L2capTest
  Replace direct usages of acl manager stream with acl link instead

4 years agoMerge changes Iafd263c7,I29300b6b,If8422986,Ied877cd6,If30d8ca4, ...
Treehugger Robot [Mon, 2 Mar 2020 20:15:58 +0000 (20:15 +0000)]
Merge changes Iafd263c7,I29300b6b,If8422986,Ied877cd6,If30d8ca4, ...

* changes:
  Register _handle_control_packet in a single place
  Migrate to use cert_acl instead of cert_acl_handle
  Remove cert_acl_data_stream from _open_channel, as it can be inferred
  Remove cert_acl_handle return value, as it was not really used
  Begin migrating L2capTest to use PyAclManager
  Begin PyL2cap, to make interfacing with l2cap facade easier
  Add Closable, to reduce repeated code
  Move captures & PyHci/PyAclManager to common cert
  Move common setup to setup_test & teardown_test
  Add IEventStream, so other subjects can use emit, etc
  Flesh out PyAclManager a little more
  Start PyAclManager, to simplify interaction with AclManager

4 years agoMerge "Add PyHciAclConnection"
Treehugger Robot [Mon, 2 Mar 2020 20:13:29 +0000 (20:13 +0000)]
Merge "Add PyHciAclConnection"

4 years agoMerge changes If61ab95a,Id9b7d89a
Treehugger Robot [Mon, 2 Mar 2020 20:13:21 +0000 (20:13 +0000)]
Merge changes If61ab95a,Id9b7d89a

* changes:
  Add PyHci helpers for page/scan and reading own address
  Add PyHci, to simplify interactions with HCI (not HCI_INTERFACES)

4 years agoGD SMP: Fix logic error in picking dialog type
Jakub Pawlowski [Mon, 2 Mar 2020 13:00:20 +0000 (14:00 +0100)]
GD SMP: Fix logic error in picking dialog type

Bug: 147086339
Change-Id: I0ccf793ec704370e6f0f36ebd8f8d73ed2941313

4 years agoMigrate remaining event stream asserts in L2capTest to truth
Zach Johnson [Mon, 2 Mar 2020 07:18:50 +0000 (23:18 -0800)]
Migrate remaining event stream asserts in L2capTest to truth

Test: cert/run --host
Change-Id: Ib9f7e8004aadc61ed9686240382443299357da1e

4 years agoMigrate information frames to matchers
Zach Johnson [Mon, 2 Mar 2020 06:37:19 +0000 (22:37 -0800)]
Migrate information frames to matchers

Test: cert/run --host --test_filter=L2capTest
Change-Id: Ife714ad8eedfdb960ecd515cfcee26e2f7873db9

4 years agoMigrate supervisory frame matching logic
Zach Johnson [Mon, 2 Mar 2020 06:20:24 +0000 (22:20 -0800)]
Migrate supervisory frame matching logic

By using matchers, we can use python named parameters
to express optionality, and improve simplicity & readability.

Test: cert/run --host --test_filter=L2capTest
Change-Id: I9f73cf1651172b7179a9963f9c07e865b126e426

4 years agoReplace a few more matchers
Zach Johnson [Mon, 2 Mar 2020 05:48:40 +0000 (21:48 -0800)]
Replace a few more matchers

Test: cert/run --host --test_filter=L2capTest
Change-Id: I6879d05699b406b9b0d1604199ce18e29d7b5d03

4 years agoMigrate connection response to L2capMatchers
Zach Johnson [Mon, 2 Mar 2020 05:40:57 +0000 (21:40 -0800)]
Migrate connection response to L2capMatchers

Test: cert/run --host --test_filter=L2capTest
Change-Id: Ia180ec59f94cd65621c19225600fceef455229bc

4 years agoStart migrating l2cap packet matchers to their own file
Zach Johnson [Mon, 2 Mar 2020 05:26:18 +0000 (21:26 -0800)]
Start migrating l2cap packet matchers to their own file

Test: cert/run --host --test_filter=L2capTest
Change-Id: Ia3aab45455042b10273a0741702faa7ea743c7b4

4 years agoSimplify packet parsing/filtering for L2capTest
Zach Johnson [Sun, 1 Mar 2020 07:47:45 +0000 (23:47 -0800)]
Simplify packet parsing/filtering for L2capTest

Test: cert/run --host --test_filter=L2capTest
Change-Id: I5578a52e89df4cf75a7ce7a330f0cca31610e093

4 years agoFix config request/response order comments
Zach Johnson [Mon, 2 Mar 2020 04:36:05 +0000 (20:36 -0800)]
Fix config request/response order comments

Test: cert/run --host --test_filter=L2capTest
Change-Id: I85837206a8a609d6d0b699eca7f3e1d181d24f51

4 years agoReplace hardcoded control packet handling with lookup table
Zach Johnson [Mon, 2 Mar 2020 04:21:33 +0000 (20:21 -0800)]
Replace hardcoded control packet handling with lookup table

Test: cert/run --host --test_filter=L2capTest
Change-Id: I086fd6c0ba775eca5414e64d430664b102c7b931

4 years agoReplace direct usages of acl manager stream with acl link instead
Zach Johnson [Sun, 1 Mar 2020 05:34:05 +0000 (21:34 -0800)]
Replace direct usages of acl manager stream with acl link instead

Also migrate some asserts to cert.truth

Test: cert/run --host --test_filter=L2capTest
Change-Id: I36446c92f5ea57807129b25322a2e5de3af50981

4 years agoRegister _handle_control_packet in a single place
Zach Johnson [Sun, 1 Mar 2020 05:23:10 +0000 (21:23 -0800)]
Register _handle_control_packet in a single place

No need for each test to register individually.

Test: cert/run --host --test_filter=L2capTest
Change-Id: Iafd263c78550b9eec4d2094b37ff4e7e8af6ef17

4 years agoMigrate to use cert_acl instead of cert_acl_handle
Zach Johnson [Sun, 1 Mar 2020 05:09:50 +0000 (21:09 -0800)]
Migrate to use cert_acl instead of cert_acl_handle

Test: cert/run --host --test_filter=L2capTest
Change-Id: I29300b6b2c3ebb67fd2dffb72c86d8a642a81b38

4 years agoRemove cert_acl_data_stream from _open_channel, as it can be inferred
Zach Johnson [Sun, 1 Mar 2020 04:54:18 +0000 (20:54 -0800)]
Remove cert_acl_data_stream from _open_channel, as it can be inferred

Test: cert/run --host --test_filter=L2capTest
Change-Id: If8422986ef6dd23b118659ff1732aeebe256a9e8

4 years agoRemove cert_acl_handle return value, as it was not really used
Zach Johnson [Sun, 1 Mar 2020 04:45:28 +0000 (20:45 -0800)]
Remove cert_acl_handle return value, as it was not really used

Test: cert/run --host --test_filter=L2capTest
Change-Id: Ied877cd6331ad229530d27d8830cef76053cc9ef

4 years agoBegin migrating L2capTest to use PyAclManager
Zach Johnson [Sun, 1 Mar 2020 04:30:04 +0000 (20:30 -0800)]
Begin migrating L2capTest to use PyAclManager

First step towards migrating the cert l2cap module to its own class.

Yes there are hacks - they will go away in a future change.

Test: cert/run --host --test_filter=L2capTest
Change-Id: If30d8ca405927eb43c1e520868b0a2862bf8d75b

4 years agoBegin PyL2cap, to make interfacing with l2cap facade easier
Zach Johnson [Sun, 1 Mar 2020 03:46:03 +0000 (19:46 -0800)]
Begin PyL2cap, to make interfacing with l2cap facade easier

Test: cert/run --host --test_filter=L2capTest
Change-Id: Ib614e1fa3cbca96607b6a1715243479b37a31b89

4 years agoAdd Closable, to reduce repeated code
Zach Johnson [Sun, 1 Mar 2020 03:19:45 +0000 (19:19 -0800)]
Add Closable, to reduce repeated code

Test: cert/run --host
Change-Id: Ia80f8e398fe4608ecd8d8a5e0b050681378ddf11

4 years agoMerge "Add function on hci to send commands (with status and with complete)" am:...
Automerger Merge Worker [Sun, 1 Mar 2020 01:51:25 +0000 (01:51 +0000)]
Merge "Add function on hci to send commands (with status and with complete)" am: d01646b974

Change-Id: I257d558ff5906c77442b9d64b4e16a932dcec89c

4 years agoMerge "Add function on hci to send commands (with status and with complete)"
Treehugger Robot [Sun, 1 Mar 2020 01:41:28 +0000 (01:41 +0000)]
Merge "Add function on hci to send commands (with status and with complete)"

4 years agoMerge "Mark updatable APEXes" am: 10295517a3
Automerger Merge Worker [Sun, 1 Mar 2020 00:41:21 +0000 (00:41 +0000)]
Merge "Mark updatable APEXes" am: 10295517a3

Change-Id: I3908d3ecd072cb8905f0f6028c2200bd224e9c98

4 years agoMerge "Cert: Add directory structure to genrule" am: 69f4bb5a51
Automerger Merge Worker [Sun, 1 Mar 2020 00:40:36 +0000 (00:40 +0000)]
Merge "Cert: Add directory structure to genrule" am: 69f4bb5a51

Change-Id: I4eda4a2cbeae1e95e00c3998f4a0272b37a4e00a

4 years agoMerge "Mark updatable APEXes"
Jiyong Park [Sun, 1 Mar 2020 00:39:18 +0000 (00:39 +0000)]
Merge "Mark updatable APEXes"