OSDN Git Service

android-x86/system-bt.git
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 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 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"

4 years agoMerge "Cert: Add directory structure to genrule"
Treehugger Robot [Sun, 1 Mar 2020 00:26:25 +0000 (00:26 +0000)]
Merge "Cert: Add directory structure to genrule"

4 years agoMove captures & PyHci/PyAclManager to common cert
Zach Johnson [Sat, 29 Feb 2020 20:38:13 +0000 (12:38 -0800)]
Move captures & PyHci/PyAclManager to common cert

This way they can be used across tests.

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

4 years agoMove common setup to setup_test & teardown_test
Zach Johnson [Sat, 29 Feb 2020 06:49:30 +0000 (22:49 -0800)]
Move common setup to setup_test & teardown_test

No need to repeat ourselves each time, and this saves
in indentation in the tests.

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

4 years agoAdd IEventStream, so other subjects can use emit, etc
Zach Johnson [Sat, 29 Feb 2020 06:34:08 +0000 (22:34 -0800)]
Add IEventStream, so other subjects can use emit, etc

And use in PyHci & PyAclManager. Can't quite turn on filtering
on the ACL messages, due to the handles being wrong.

Test: cert/run --host --test_filter=AclManagerTest
Change-Id: I30ef332b06ae553553757337cd66da91f8debe3a

4 years agoAdd helper function on hci, to simplify hci event stream creation am: f391d0c5dc
Automerger Merge Worker [Sat, 29 Feb 2020 05:52:43 +0000 (05:52 +0000)]
Add helper function on hci, to simplify hci event stream creation am: f391d0c5dc

Change-Id: Ib9cbd28b5068e643d57fff8cd68f31d545d4df31

4 years agoAdd function to request multiple event types from hci am: 8c442afcc6
Automerger Merge Worker [Sat, 29 Feb 2020 05:52:32 +0000 (05:52 +0000)]
Add function to request multiple event types from hci am: 8c442afcc6

Change-Id: I59e55b51b0e4817901ebae4151ec1c70eeccdfa1

4 years agoFlesh out PyAclManager a little more
Zach Johnson [Sat, 29 Feb 2020 05:47:53 +0000 (21:47 -0800)]
Flesh out PyAclManager a little more

Test: cert/run --host --test_filter=AclManagerTest
Change-Id: Ifad59da2bbac45b897547711d638d7bbca397372

4 years agoCert: Add directory structure to genrule
Jack He [Sat, 29 Feb 2020 05:40:40 +0000 (21:40 -0800)]
Cert: Add directory structure to genrule

* The generated Python directory need to overlap with the GD source
  directries for them to run together in one ACTS test
* Since both generated library and source library has Python modules
  with the same name, such as "cert", they must not have duplicate
  files for them to be imported in the same interpreter

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

4 years agoStart PyAclManager, to simplify interaction with AclManager
Zach Johnson [Sat, 29 Feb 2020 05:05:34 +0000 (21:05 -0800)]
Start PyAclManager, to simplify interaction with AclManager

Test: cert/run --host --test_filter=AclManagerTest
Change-Id: I336898fb439f5f48d87bdb735bae728164e4f6be

4 years agoAdd PyHciAclConnection
Zach Johnson [Sat, 29 Feb 2020 01:37:17 +0000 (17:37 -0800)]
Add PyHciAclConnection

Does not yet handle incoming data in an abstracted way.

Test: cert/run --host --test_filter=AclManagerTest
Change-Id: I68bbafdd65e5f76c8a368a5fd380634a4e93eaba

4 years agoAdd PyHci helpers for page/scan and reading own address
Zach Johnson [Sat, 29 Feb 2020 01:08:15 +0000 (17:08 -0800)]
Add PyHci helpers for page/scan and reading own address

Test: cert/run --host --test_filter=AclManagerTest
Change-Id: If61ab95a80f1a3f654ebf0fc9b63857c2b6b401d

4 years agoAdd PyHci, to simplify interactions with HCI (not HCI_INTERFACES)
Zach Johnson [Sat, 29 Feb 2020 00:59:04 +0000 (16:59 -0800)]
Add PyHci, to simplify interactions with HCI (not HCI_INTERFACES)

Test: cert/run --host --test_filter=AclManagerTest
Change-Id: Id9b7d89aba3369b32fa17759c912439ba43d37b3

4 years agoAdd function on hci to send commands (with status and with complete)
Zach Johnson [Sat, 29 Feb 2020 00:24:13 +0000 (16:24 -0800)]
Add function on hci to send commands (with status and with complete)

No need for tests to each have their own implementation.

Test: cert/run --host --test_filter=AclManagerTest
Change-Id: I3213367fa162cde1179a98cb3d1801850f01aa61

4 years agoAdd helper function on hci, to simplify hci event stream creation
Zach Johnson [Sat, 29 Feb 2020 00:10:08 +0000 (16:10 -0800)]
Add helper function on hci, to simplify hci event stream creation

Test: cert/run --host --test_filter=AclManagerTest
Change-Id: I0a0159eadc45dc54201ccea4b6167b059430de49

4 years agoMerge changes I56018319,Id324c5b4,I73e50e6c am: 03adb96fc2
Automerger Merge Worker [Sat, 29 Feb 2020 00:07:22 +0000 (00:07 +0000)]
Merge changes I56018319,Id324c5b4,I73e50e6c am: 03adb96fc2

Change-Id: I18c172ae3a146ba4f43ac3a4759ec70ffe495f9b

4 years agoMerge "Add event stream to cert/truth, and start using in AclManagerTest" am: 8543d2186b
Automerger Merge Worker [Sat, 29 Feb 2020 00:07:16 +0000 (00:07 +0000)]
Merge "Add event stream to cert/truth, and start using in AclManagerTest" am: 8543d2186b

Change-Id: If66e720563253bfe281ca3fc4b57ccbe965f8bf1

4 years agoMerge "Add a truth module, to make cert asserts more fluent" am: 678b95cb77
Automerger Merge Worker [Sat, 29 Feb 2020 00:07:09 +0000 (00:07 +0000)]
Merge "Add a truth module, to make cert asserts more fluent" am: 678b95cb77

Change-Id: I97197df03178522a011df84c0bad0acdaf6c5698

4 years agoAdd function to request multiple event types from hci
Zach Johnson [Fri, 28 Feb 2020 23:57:42 +0000 (15:57 -0800)]
Add function to request multiple event types from hci

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

4 years agoMerge changes I56018319,Id324c5b4,I73e50e6c
Zach Johnson [Fri, 28 Feb 2020 23:56:21 +0000 (23:56 +0000)]
Merge changes I56018319,Id324c5b4,I73e50e6c

* changes:
  Add captures, to clean up test logic and make tests easer to read
  Add multi-matcher assert on EventStream, and expose through truth
  Merge EventCallbackStream & EventAsserts into EventStream

4 years agoMerge "Add event stream to cert/truth, and start using in AclManagerTest"
Treehugger Robot [Fri, 28 Feb 2020 23:56:20 +0000 (23:56 +0000)]
Merge "Add event stream to cert/truth, and start using in AclManagerTest"

4 years agoMerge "Add a truth module, to make cert asserts more fluent"
Treehugger Robot [Fri, 28 Feb 2020 23:56:14 +0000 (23:56 +0000)]
Merge "Add a truth module, to make cert asserts more fluent"

4 years agoMerge "Register bond state change change callbacks in shim" am: de0937dc81
Automerger Merge Worker [Fri, 28 Feb 2020 22:59:54 +0000 (22:59 +0000)]
Merge "Register bond state change change callbacks in shim" am: de0937dc81

Change-Id: I2443b3e10fbd1d6124b7daa688907e4f7c4c1aa3

4 years agoMerge "Register bond state change change callbacks in shim"
Treehugger Robot [Fri, 28 Feb 2020 22:48:11 +0000 (22:48 +0000)]
Merge "Register bond state change change callbacks in shim"

4 years agoMerge "ModuleRegistry: Delete Module after all are stopped" am: 0a319ab89e
Automerger Merge Worker [Fri, 28 Feb 2020 22:38:28 +0000 (22:38 +0000)]
Merge "ModuleRegistry: Delete Module after all are stopped" am: 0a319ab89e

Change-Id: I18e3cc862b7028f12154a1684b68eeff2e2cb1c4

4 years agoMerge "gd: l2cap Skip undefined options when parsing" am: 0328de9e60
Automerger Merge Worker [Fri, 28 Feb 2020 22:38:22 +0000 (22:38 +0000)]
Merge "gd: l2cap Skip undefined options when parsing" am: 0328de9e60

Change-Id: I94125bb60a2ff6dce6cb8e337f70615b9ee1b344

4 years agoMerge "ModuleRegistry: Delete Module after all are stopped"
Treehugger Robot [Fri, 28 Feb 2020 22:36:39 +0000 (22:36 +0000)]
Merge "ModuleRegistry: Delete Module after all are stopped"

4 years agoMerge "gd: l2cap Skip undefined options when parsing"
Treehugger Robot [Fri, 28 Feb 2020 22:30:01 +0000 (22:30 +0000)]
Merge "gd: l2cap Skip undefined options when parsing"

4 years agoAdd captures, to clean up test logic and make tests easer to read
Zach Johnson [Fri, 28 Feb 2020 06:23:40 +0000 (22:23 -0800)]
Add captures, to clean up test logic and make tests easer to read

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

4 years agoAdd multi-matcher assert on EventStream, and expose through truth
Zach Johnson [Fri, 28 Feb 2020 05:27:21 +0000 (21:27 -0800)]
Add multi-matcher assert on EventStream, and expose through truth

Test: cert/run --host --test_filter=CertSelfTest
Change-Id: Id324c5b47dd988c7d6f2597b67dba17614026ca0

4 years agoMerge EventCallbackStream & EventAsserts into EventStream
Zach Johnson [Fri, 28 Feb 2020 04:09:06 +0000 (20:09 -0800)]
Merge EventCallbackStream & EventAsserts into EventStream

Simplifies testing logic a bit, support for multi-independent asserts
will come in a later patch, on EventStream.

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

4 years agoAdd event stream to cert/truth, and start using in AclManagerTest
Zach Johnson [Thu, 27 Feb 2020 00:24:54 +0000 (16:24 -0800)]
Add event stream to cert/truth, and start using in AclManagerTest

Makes tests more fluent, and paves the way to more complex stream assertions
in the future.

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

4 years agoAdd a truth module, to make cert asserts more fluent
Zach Johnson [Wed, 26 Feb 2020 23:49:02 +0000 (15:49 -0800)]
Add a truth module, to make cert asserts more fluent

More to come, with event streams.

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

4 years agogd: l2cap Skip undefined options when parsing
Chris Manton [Wed, 26 Feb 2020 19:59:56 +0000 (11:59 -0800)]
gd: l2cap Skip undefined options when parsing

Bug: 150426178
Test: bluetooth_test_gd
Change-Id: I3017c0c04e4799dfe99e01c7440bdc9915a15222

4 years agoL2capTest: Fix cert device name am: 7b2b96ecdb
Automerger Merge Worker [Fri, 28 Feb 2020 20:06:35 +0000 (20:06 +0000)]
L2capTest: Fix cert device name am: 7b2b96ecdb

Change-Id: I84ee16dff0363897dfc5ad5c965895f64dfd730e

4 years agoModuleRegistry: Delete Module after all are stopped
Hansong Zhang [Fri, 28 Feb 2020 00:44:11 +0000 (16:44 -0800)]
ModuleRegistry: Delete Module after all are stopped

If a Module is stopped, it may still receive callback from lower level
Module, because the callback may have already been in lower level
Module's Handler queue. Instead of deleting the stopped Module
immediately, wait until all Modules are stopped.

Bug: 150174451
Test: bluetooth_test_gd
Change-Id: I0b55fe0ac7da09332d381d2192235339a9dc23fa

4 years agoL2capTest: Fix cert device name
Hansong Zhang [Thu, 27 Feb 2020 22:24:12 +0000 (14:24 -0800)]
L2capTest: Fix cert device name

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

4 years agoRegister bond state change change callbacks in shim
Jakub Pawlowski [Fri, 28 Feb 2020 17:01:03 +0000 (18:01 +0100)]
Register bond state change change callbacks in shim

Without notifying bond success/failure, Settings will keep displaying
the pairing notification forever.

Bug: 147086339
Test: attempt to bond with remote device, cancel from remote
Change-Id: I55dfc35d35955a07973d20ade36cc9ec99c58a24

4 years agoSome simplifications to ControllerTest am: 36cfb824a5
Automerger Merge Worker [Fri, 28 Feb 2020 04:39:01 +0000 (04:39 +0000)]
Some simplifications to ControllerTest am: 36cfb824a5

Change-Id: Id03f0f928ffb4637c19dbca29c6490694405299d

4 years agoSome simplifications to ControllerTest
Zach Johnson [Wed, 26 Feb 2020 22:23:30 +0000 (14:23 -0800)]
Some simplifications to ControllerTest

Test: cert/run --host --test_filter=ControllerTest
Change-Id: I75de2d62ebe38ebe5942d7ab3d430303f4da61b3

4 years agoMerge "Wire Security UI callback for pin entry cases" am: 88c7e021fe
Automerger Merge Worker [Fri, 28 Feb 2020 03:15:14 +0000 (03:15 +0000)]
Merge "Wire Security UI callback for pin entry cases" am: 88c7e021fe

Change-Id: I0547193bbd57dfde753bd9443bdded4ad43d682b

4 years agoMerge "Wire Security UI callback for pin entry cases"
Treehugger Robot [Fri, 28 Feb 2020 03:03:29 +0000 (03:03 +0000)]
Merge "Wire Security UI callback for pin entry cases"

4 years agoMerge "SM: Fix cert test" am: aee81e2c0d
Automerger Merge Worker [Thu, 27 Feb 2020 23:37:45 +0000 (23:37 +0000)]
Merge "SM: Fix cert test" am: aee81e2c0d

Change-Id: Ica62c712beb442eb40feffa3056587f8c24a4d60

4 years agoMerge "SM: Fix cert test"
Treehugger Robot [Thu, 27 Feb 2020 23:26:29 +0000 (23:26 +0000)]
Merge "SM: Fix cert test"

4 years agoFix logic bug in shim am: 35fcd98184
Automerger Merge Worker [Thu, 27 Feb 2020 22:48:34 +0000 (22:48 +0000)]
Fix logic bug in shim am: 35fcd98184

Change-Id: I128b56fa49e3af262b4fdb0840cc5c1e1d35822b

4 years agoWire Security UI callback for pin entry cases
Jakub Pawlowski [Wed, 26 Feb 2020 13:24:10 +0000 (14:24 +0100)]
Wire Security UI callback for pin entry cases

Bug: 147086339
Change-Id: Ia15b0c95bff59010bb65da23eab4a02bd36834c3

4 years agoFix logic bug in shim
Greg Kaiser [Thu, 27 Feb 2020 14:31:05 +0000 (06:31 -0800)]
Fix logic bug in shim

We want to check the BLE mask constant against the device_type
variable.  Checking the make constant against itself was always
true.

Test: TreeHugger
Change-Id: Ifb157a4779b40210c3340439c2a6da30e276aa6a

4 years agoWire Security UI callbacks am: 3ae417f687
Automerger Merge Worker [Thu, 27 Feb 2020 08:23:11 +0000 (08:23 +0000)]
Wire Security UI callbacks am: 3ae417f687

Change-Id: Iea6b372c69de27aabe4354d60d3705e60e3fe149

4 years agoWire Security UI callbacks
Jakub Pawlowski [Wed, 26 Feb 2020 13:24:10 +0000 (14:24 +0100)]
Wire Security UI callbacks

Bug: 147086339
Change-Id: I719459314dd33d922a575126b74ee133f8ac2289

4 years agoSM: Fix cert test
Martin Brabham [Wed, 26 Feb 2020 22:32:10 +0000 (14:32 -0800)]
SM: Fix cert test

Bug: 145638034
Test: ./cert/run_cert_facade_only.sh
Change-Id: I68214d6dc80455b6993fcc839071aa5c6eb18a85

4 years agoMerge changes I29072204,Ica71783b am: ed462fcf82
Automerger Merge Worker [Thu, 27 Feb 2020 02:16:12 +0000 (02:16 +0000)]
Merge changes I29072204,Ica71783b am: ed462fcf82

Change-Id: Ifcffcb231e202a5e42a2e83d2444356682e93e50

4 years agoMerge "Simplify running cert tests and allow filtering, auto build" am: 1c8b8431e1
Automerger Merge Worker [Thu, 27 Feb 2020 02:15:42 +0000 (02:15 +0000)]
Merge "Simplify running cert tests and allow filtering, auto build" am: 1c8b8431e1

Change-Id: I79ee3131e95edf5acb868a3c1e8d81bbb0a51584

4 years agoMerge changes I29072204,Ica71783b
Treehugger Robot [Thu, 27 Feb 2020 02:13:45 +0000 (02:13 +0000)]
Merge changes I29072204,Ica71783b

* changes:
  Rename device_under_test and cert_device, to simpler more consistent names
  Simplify cert test setup

4 years agoMerge "Simplify running cert tests and allow filtering, auto build"
Treehugger Robot [Thu, 27 Feb 2020 02:03:23 +0000 (02:03 +0000)]
Merge "Simplify running cert tests and allow filtering, auto build"

4 years agoMark updatable APEXes
Jiyong Park [Mon, 24 Feb 2020 09:39:19 +0000 (18:39 +0900)]
Mark updatable APEXes

Mark updatable APEXes as updatable: true so that they are opted-out from
optimizations that make sense only for non-updatable modules; such as
symlinking to the libs in the system partition.

Bug: 149805758
Test: m and check that there is no symlink from the APEX to the system
partition.

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: Id21fa176acce4800fb8e6c723007f6a4aa2d1bab
(cherry picked from commit f3d123910b4c899b3aed8d82272fa5d24b6dc426)
Change-Id: Id21fa176acce4800fb8e6c723007f6a4aa2d1bab

4 years agoFix ACL Manager start_round_robin logic and add log am: 496bd9c56d
Automerger Merge Worker [Thu, 27 Feb 2020 01:28:17 +0000 (01:28 +0000)]
Fix ACL Manager start_round_robin logic and add log am: 496bd9c56d

Change-Id: I5f4a40a09fc657ce218e77a484ab9e48185e2080

4 years agoFix ACL Manager start_round_robin logic and add log
Hansong Zhang [Wed, 26 Feb 2020 20:32:23 +0000 (12:32 -0800)]
Fix ACL Manager start_round_robin logic and add log

Bug: 150174451
Test: cert/run_device_cert.sh
Change-Id: Id27b2bfe710cc8efccc5513a94e2c72160afef27

4 years agoMerge "gd: Add l2cap pts cert test" am: 425177e48a
Automerger Merge Worker [Wed, 26 Feb 2020 23:20:21 +0000 (23:20 +0000)]
Merge "gd: Add l2cap pts cert test" am: 425177e48a

Change-Id: I8e1fe881695dbc46c5cd87261be42709ebb95176

4 years agoMerge "gd: Add l2cap pts cert test"
Treehugger Robot [Wed, 26 Feb 2020 23:04:19 +0000 (23:04 +0000)]
Merge "gd: Add l2cap pts cert test"

4 years agoRename device_under_test and cert_device, to simpler more consistent names
Zach Johnson [Wed, 26 Feb 2020 21:54:26 +0000 (13:54 -0800)]
Rename device_under_test and cert_device, to simpler more consistent names

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

4 years agoSimplify cert test setup
Zach Johnson [Wed, 26 Feb 2020 21:24:48 +0000 (13:24 -0800)]
Simplify cert test setup

Pass the dut_module and cert_module as arguments to setting up
the class. Use named arguments for clarity.

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

4 years agoSimplify running cert tests and allow filtering, auto build
Zach Johnson [Wed, 26 Feb 2020 20:26:20 +0000 (12:26 -0800)]
Simplify running cert tests and allow filtering, auto build

* Combine device and host into same scripts, switched on an argument
* Build automatically when you run
* Allow specifying a test filter, to run a specific test instead of all of them.
* Clean up file naming, to remove "facade only".

Test: gd/cert/run --host
Change-Id: I9d55c65f7fadc9b0a926aad03ad3a2ed8a5f0e63

4 years agogd: Add l2cap pts cert test
Chris Manton [Wed, 26 Feb 2020 17:19:57 +0000 (09:19 -0800)]
gd: Add l2cap pts cert test

L2CAP/COS/CFD/BV-02-C

Bug: 150296337
Test: run_cert_facade_only.sh
Test: pts@bluetooth.com

Change-Id: I4c06cf2d5cb7ac9ab9126f55878b5596ec4a9bdc

4 years agoBonding: pass device_type into GD shim and guess the transport am: bec4eaaec1
Automerger Merge Worker [Wed, 26 Feb 2020 14:11:43 +0000 (14:11 +0000)]
Bonding: pass device_type into GD shim and guess the transport am: bec4eaaec1

Change-Id: Icc9f36bfef4bfeefd86ff5d8ed2faf8574805938