OSDN Git Service

android-x86/system-bt.git
3 years agoMerge "Cert: Run script additions" am: 2fd265bb52
Treehugger Robot [Fri, 11 Dec 2020 21:12:01 +0000 (21:12 +0000)]
Merge "Cert: Run script additions" am: 2fd265bb52

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48f5dcf8cfb08bd1b6c9c4dea7b851b9bb7324e4

3 years agoMerge "Cert: Run script additions"
Treehugger Robot [Fri, 11 Dec 2020 20:50:56 +0000 (20:50 +0000)]
Merge "Cert: Run script additions"

3 years agoMerge changes I6b64dc43,I499835b0 am: 1a93d59cec
Zach Johnson [Fri, 11 Dec 2020 19:51:56 +0000 (19:51 +0000)]
Merge changes I6b64dc43,I499835b0 am: 1a93d59cec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a13511d6d82230c2f5cb2ab5071892ab5d2b979

3 years agoMerge changes I6b64dc43,I499835b0
Zach Johnson [Fri, 11 Dec 2020 18:53:50 +0000 (18:53 +0000)]
Merge changes I6b64dc43,I499835b0

* changes:
  rusty-gd: start writing array fields in write_to()
  rusty-gd: add stubs for to_bytes and write_to

3 years agoMerge "fix init flag parsing" am: bc2716bfa0
Zach Johnson [Fri, 11 Dec 2020 18:13:13 +0000 (18:13 +0000)]
Merge "fix init flag parsing" am: bc2716bfa0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I119d0dbd72a53b461fb776294bb85ec88fb71554

3 years agoMerge "fix init flag parsing"
Zach Johnson [Fri, 11 Dec 2020 17:18:41 +0000 (17:18 +0000)]
Merge "fix init flag parsing"

3 years agoMerge "gd ACL: Print warnings for invalid handles" am: 862c044b3e
Treehugger Robot [Fri, 11 Dec 2020 10:04:36 +0000 (10:04 +0000)]
Merge "gd ACL: Print warnings for invalid handles" am: 862c044b3e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ac767791d8d01c1540a6ce0fda67bb577d3732a

3 years agoMerge "gd ACL: Print warnings for invalid handles"
Treehugger Robot [Fri, 11 Dec 2020 09:49:39 +0000 (09:49 +0000)]
Merge "gd ACL: Print warnings for invalid handles"

3 years agoMerge changes Iddb9d483,Ia3af25d2 am: 4ca9b304b7
Treehugger Robot [Fri, 11 Dec 2020 06:31:08 +0000 (06:31 +0000)]
Merge changes Iddb9d483,Ia3af25d2 am: 4ca9b304b7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I766f66298a22e8da1007fc18511c091486f054ba

3 years agoMerge changes Iddb9d483,Ia3af25d2
Treehugger Robot [Fri, 11 Dec 2020 06:19:44 +0000 (06:19 +0000)]
Merge changes Iddb9d483,Ia3af25d2

* changes:
  gd: implement APIs of Advertising for Android HCI
  gd: Fix flaky tests of LeAddressManager

3 years agorusty-gd: turn off darwin builds am: f34ef3e41e
Zach Johnson [Fri, 11 Dec 2020 02:35:52 +0000 (02:35 +0000)]
rusty-gd: turn off darwin builds am: f34ef3e41e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I595daa3a509e90b0880300eb9efa201215e1f4e2

3 years agorusty-gd: turn off darwin builds
Zach Johnson [Fri, 11 Dec 2020 02:07:21 +0000 (18:07 -0800)]
rusty-gd: turn off darwin builds

Bug: 175349389
Test: compile
Change-Id: Idd133992c743cc24fb8e592c3091bd081a8d2b95

3 years agorusty-gd: start writing array fields in write_to()
Zach Johnson [Fri, 11 Dec 2020 00:50:23 +0000 (16:50 -0800)]
rusty-gd: start writing array fields in write_to()

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I6b64dc436d887a7fe67fd98eb98d972b52ce9134

3 years agorusty-gd: add stubs for to_bytes and write_to
Zach Johnson [Thu, 10 Dec 2020 23:52:23 +0000 (15:52 -0800)]
rusty-gd: add stubs for to_bytes and write_to

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I499835b0872c97f037cee68939247613bfa922da

3 years agoMerge changes I448e8ee9,I3b20f04b,I038364bc am: 2688c66292
Zach Johnson [Thu, 10 Dec 2020 22:27:43 +0000 (22:27 +0000)]
Merge changes I448e8ee9,I3b20f04b,I038364bc am: 2688c66292

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44d11162dade83a813019a2812c2f83f88a94a20

3 years agofix init flag parsing
Zach Johnson [Thu, 10 Dec 2020 20:37:05 +0000 (12:37 -0800)]
fix init flag parsing

late change to fix unit test broke rust side parsing

save pointer so we can restart for rust

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I8796b79f036b312bf202e0124ab8e6cfc6732941

3 years agoMerge changes I448e8ee9,I3b20f04b,I038364bc
Zach Johnson [Thu, 10 Dec 2020 22:12:58 +0000 (22:12 +0000)]
Merge changes I448e8ee9,I3b20f04b,I038364bc

* changes:
  rusty-gd: forward ACL channels in HciExports, expose over facades
  rusty-gd: simplify hci facade implementation
  rusty-gd: reorg hci internals

3 years agoMerge "rusty-gd: stub out HCI shim FFI" am: 71779af38d
Zach Johnson [Thu, 10 Dec 2020 21:00:22 +0000 (21:00 +0000)]
Merge "rusty-gd: stub out HCI shim FFI" am: 71779af38d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5686ad77b7ca2cdb37b5cdbb4056dfa175fc623c

3 years agoMerge changes I48e01da5,Ic6a7bff6,I9a568d60,Id1b5926a am: 26dceb3ad4
Treehugger Robot [Thu, 10 Dec 2020 20:59:35 +0000 (20:59 +0000)]
Merge changes I48e01da5,Ic6a7bff6,I9a568d60,Id1b5926a am: 26dceb3ad4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idddfdcd675274349a2c88c998f5365e962e26e5e

3 years agoMerge "rusty-gd: stub out HCI shim FFI"
Zach Johnson [Thu, 10 Dec 2020 20:53:16 +0000 (20:53 +0000)]
Merge "rusty-gd: stub out HCI shim FFI"

3 years agoMerge changes I48e01da5,Ic6a7bff6,I9a568d60,Id1b5926a
Treehugger Robot [Thu, 10 Dec 2020 20:42:59 +0000 (20:42 +0000)]
Merge changes I48e01da5,Ic6a7bff6,I9a568d60,Id1b5926a

* changes:
  Add stack/acl/btm_acl::link_policy_text
  Add stack/include/gatt_api::gatt_op_code_text
  Add API tL2C_LCB::number_of_active_dynamic_channels
  Add stack/l2cap/l2c_api::fixed_channel_text

3 years agoMerge changes I428211dc,I20f897a8 am: e8adbbb403
Zach Johnson [Thu, 10 Dec 2020 19:46:52 +0000 (19:46 +0000)]
Merge changes I428211dc,I20f897a8 am: e8adbbb403

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a4d9bcda23ab661c79488f2af312c455efd106a

3 years agoMerge changes I7fe4a9ee,I65e5688c,I0f04b289 am: 855ead0e80
Qasim Javed [Thu, 10 Dec 2020 19:41:25 +0000 (19:41 +0000)]
Merge changes I7fe4a9ee,I65e5688c,I0f04b289 am: 855ead0e80

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I995f5e4c5e236cfe6322906270ab32e5f9230c8f

3 years agoMerge changes I428211dc,I20f897a8
Zach Johnson [Thu, 10 Dec 2020 19:30:47 +0000 (19:30 +0000)]
Merge changes I428211dc,I20f897a8

* changes:
  rusty-gd: reorganize HCI shim to make cpp and rust distinct
  rusty-gd: move common stack logic to bt_main

3 years agoMerge changes I7fe4a9ee,I65e5688c,I0f04b289
Qasim Javed [Thu, 10 Dec 2020 19:23:10 +0000 (19:23 +0000)]
Merge changes I7fe4a9ee,I65e5688c,I0f04b289

* changes:
  rusty-gd: Update new constructor and add parse constructor.
  rusty-gd: Generate constructor for structs
  rusty-gd: Generate struct declarations and enums

3 years agoStop address rotation when stack is shutdown am: d56ea3c9eb
Hansong Zhang [Thu, 10 Dec 2020 18:54:42 +0000 (18:54 +0000)]
Stop address rotation when stack is shutdown am: d56ea3c9eb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22a7027057637d9486bad061427891df9a428807

3 years agoL2cap shim: Clean up LE dynamic channel part am: c9ee34efad
Hansong Zhang [Thu, 10 Dec 2020 18:54:00 +0000 (18:54 +0000)]
L2cap shim: Clean up LE dynamic channel part am: c9ee34efad

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc689a09118f1fb9c1bc82906982ac1085dc8665

3 years agoAdd stack/acl/btm_acl::link_policy_text
Chris Manton [Tue, 1 Dec 2020 23:23:45 +0000 (15:23 -0800)]
Add stack/acl/btm_acl::link_policy_text

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I48e01da55fdaaef9c3d56d49bc1feb13de618bd2

3 years agoAdd stack/include/gatt_api::gatt_op_code_text
Chris Manton [Fri, 20 Nov 2020 18:05:23 +0000 (10:05 -0800)]
Add stack/include/gatt_api::gatt_op_code_text

Toward readable eode

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: Ic6a7bff6be50381f1e9b1df9f22be10f3df2ed29

3 years agoAdd API tL2C_LCB::number_of_active_dynamic_channels
Chris Manton [Thu, 19 Nov 2020 00:24:42 +0000 (16:24 -0800)]
Add API tL2C_LCB::number_of_active_dynamic_channels

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I9a568d60c444c1ec9811f4fd42ac3b371318aad2

3 years agoAdd stack/l2cap/l2c_api::fixed_channel_text
Chris Manton [Thu, 19 Nov 2020 16:49:05 +0000 (08:49 -0800)]
Add stack/l2cap/l2c_api::fixed_channel_text

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: Id1b5926a82c7a90ed1c1591a2bf561772e9ce8b1

3 years agoStop address rotation when stack is shutdown
Hansong Zhang [Tue, 8 Dec 2020 20:53:30 +0000 (12:53 -0800)]
Stop address rotation when stack is shutdown

Tag: #stability
Bug: 174293979
Test: Start and stop the stack
Change-Id: I28846762271201384c1902eccc87029b4671f462

3 years agoL2cap shim: Clean up LE dynamic channel part
Hansong Zhang [Fri, 4 Dec 2020 23:37:27 +0000 (15:37 -0800)]
L2cap shim: Clean up LE dynamic channel part

Use cid token as a key for channels, just like what we did for classic,
to support multiple channels for the same PSM.

Also account for channel config and security policy.

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Test: CtsVerifier
Change-Id: Ia5a631e8603bbe51a2b53b1fe955e3f0c1e02325

3 years agoenum-ify stack/include/gatt_api::GATT_OP_CODE_ am: 9998bb2d71
Chris Manton [Thu, 10 Dec 2020 17:59:37 +0000 (17:59 +0000)]
enum-ify stack/include/gatt_api::GATT_OP_CODE_ am: 9998bb2d71

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic40dbbeb26b3b9109ddb056a1e67f2f269ff7762

3 years agorusty-gd: forward ACL channels in HciExports, expose over facades
Zach Johnson [Thu, 3 Dec 2020 01:15:00 +0000 (17:15 -0800)]
rusty-gd: forward ACL channels in HciExports, expose over facades

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I448e8ee990fefe480c6e6541157565c399374be6

3 years agorusty-gd: stub out HCI shim FFI
Zach Johnson [Wed, 2 Dec 2020 21:45:19 +0000 (13:45 -0800)]
rusty-gd: stub out HCI shim FFI

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I2e02896d344db953d1bfec6c5c7fdbdc8eb4a00c

3 years agorusty-gd: simplify hci facade implementation
Zach Johnson [Thu, 3 Dec 2020 01:01:27 +0000 (17:01 -0800)]
rusty-gd: simplify hci facade implementation

the extra complexity wasn't needed on the hal facade, so
we can simplify this one too

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I3b20f04b549c70c10263a95a89a2ab5becfaccd5

3 years agorusty-gd: reorg hci internals
Zach Johnson [Thu, 3 Dec 2020 00:30:29 +0000 (16:30 -0800)]
rusty-gd: reorg hci internals

with the intent of adding dynamically registered event receivers:

1. combine incoming and outgoing into a single selected dispatch (to
eliminate need to lock on pending commands)

2. add dynamically registered event receivers

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I038364bc8d99b7ead4688f7570b79826fa7a1651

3 years agorusty-gd: reorganize HCI shim to make cpp and rust distinct
Zach Johnson [Wed, 2 Dec 2020 00:05:29 +0000 (16:05 -0800)]
rusty-gd: reorganize HCI shim to make cpp and rust distinct

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I428211dc33aa9fa062626ac873b83e499719fdfb

3 years agorusty-gd: move common stack logic to bt_main
Zach Johnson [Tue, 1 Dec 2020 21:08:36 +0000 (13:08 -0800)]
rusty-gd: move common stack logic to bt_main

prep for sharing with shim

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I20f897a894973506cd777a5164c268db8fb2fc7d

3 years agoenum-ify stack/include/gatt_api::GATT_OP_CODE_
Chris Manton [Fri, 20 Nov 2020 17:48:44 +0000 (09:48 -0800)]
enum-ify stack/include/gatt_api::GATT_OP_CODE_

Toward readable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I133f5bb129540404c1fb07dd5b3c068da725b4e5

3 years agoMerge "Add LE Read ISO link quality" am: 45d5c0f81f
Jakub Pawlowski [Thu, 10 Dec 2020 08:34:44 +0000 (08:34 +0000)]
Merge "Add LE Read ISO link quality" am: 45d5c0f81f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d4e84244453e7307fca898233925a67c8da56ba

3 years agoMerge "Add LE Read ISO link quality"
Jakub Pawlowski [Thu, 10 Dec 2020 08:09:18 +0000 (08:09 +0000)]
Merge "Add LE Read ISO link quality"

3 years ago[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: c23a525c0c -s ours
Xin Li [Thu, 10 Dec 2020 03:04:55 +0000 (03:04 +0000)]
[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: c23a525c0c -s ours

am skip reason: Change-Id Ibf87b4db0c49db9f489b2937bff9691258f71e16 with SHA-1 daaf0c11ee is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I729274fadcb81923f953f0b9f74f20b271d11e48

3 years agoDO NOT MERGE - Merge Android R QPR1
Xin Li [Thu, 10 Dec 2020 01:44:05 +0000 (17:44 -0800)]
DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ibf87b4db0c49db9f489b2937bff9691258f71e16
Change-Id: Ied5bcebdcd24b61fd49e29f6b894b56b08909327

3 years agoMerge changes from topic "revert-1518559-revert-1512686-LIHRZNOOWL-ZWQBPCZFIZ" am...
Zach Johnson [Wed, 9 Dec 2020 21:49:05 +0000 (21:49 +0000)]
Merge changes from topic "revert-1518559-revert-1512686-LIHRZNOOWL-ZWQBPCZFIZ" am: 9409f22301

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf87b4db0c49db9f489b2937bff9691258f71e16

3 years agoMerge changes from topic "revert-1518559-revert-1512686-LIHRZNOOWL-ZWQBPCZFIZ"
Zach Johnson [Wed, 9 Dec 2020 21:02:37 +0000 (21:02 +0000)]
Merge changes from topic "revert-1518559-revert-1512686-LIHRZNOOWL-ZWQBPCZFIZ"

* changes:
  Revert "Revert "rusty-gd: add stack start stubs, define shim lib..."
  Revert^2 "rusty-gd: move init_flag parsing to rust"
  Revert^2 "rusty-gd: compile into libbluetooth"

3 years agoAdd LE Read ISO link quality
Jakub Pawlowski [Tue, 8 Dec 2020 15:06:57 +0000 (16:06 +0100)]
Add LE Read ISO link quality

Tag: #feature
Test: manually verified HCI snoop log content
Bug: 150670922
Change-Id: I0d0f91b1f7e9e61079e429c1c8fb57028b4b52a3

3 years agoCert: Run script additions
Martin Brabham [Fri, 6 Nov 2020 22:14:08 +0000 (14:14 -0800)]
Cert: Run script additions

Default to host, don't require --host.
Most runs are host anyway.  In order to run on device
specify --device.

This will open a new menu for selecting
a device if devices don't exist in the config.  Otherwise,
it'll use the config settings.

Bug: 175149850
Test: cert/run --device
Tag: #gd-refactor
Change-Id: I033adc102833fd18e78e119ae59059bbff1048cb

3 years agoMerge "btm: Add BIS related code to Iso Manager" am: 09a743275c
Jakub Pawlowski [Wed, 9 Dec 2020 18:35:11 +0000 (18:35 +0000)]
Merge "btm: Add BIS related code to Iso Manager" am: 09a743275c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0198d91eb70441c1548aa107d0d3988f8bed4930

3 years agoMerge "btm: Add BIS related code to Iso Manager"
Jakub Pawlowski [Wed, 9 Dec 2020 17:44:55 +0000 (17:44 +0000)]
Merge "btm: Add BIS related code to Iso Manager"

3 years agorusty-gd: Update new constructor and add parse constructor.
Qasim Javed [Tue, 8 Dec 2020 19:32:11 +0000 (11:32 -0800)]
rusty-gd: Update new constructor and add parse constructor.

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I7fe4a9eef6ca37a2a4428bd7439398fc46744db0

3 years agoRevert "Revert "rusty-gd: add stack start stubs, define shim lib..."
Zach Johnson [Wed, 9 Dec 2020 00:39:55 +0000 (00:39 +0000)]
Revert "Revert "rusty-gd: add stack start stubs, define shim lib..."

Revert submission 1518559-revert-1512686-LIHRZNOOWL

Reason for revert: build system fixed
Reverted Changes:
I760eea76d:Revert "rusty-gd: add stack start stubs, define sh...
I5740575cf:Revert "rusty-gd: move init_flag parsing to rust"
I0cfbe779c:Revert "rusty-gd: compile into libbluetooth"

Change-Id: I5f0f76450889d7906e9a763a4ebc5a46daf673b7

3 years agoRevert^2 "rusty-gd: move init_flag parsing to rust"
Zach Johnson [Wed, 9 Dec 2020 00:39:55 +0000 (00:39 +0000)]
Revert^2 "rusty-gd: move init_flag parsing to rust"

126ad36e2b8cd19d41cd60d056e704d7a5042f71

Change-Id: I93a7ee9a2fb6afda535f25348a7f94fac1a1d116

3 years agoRevert^2 "rusty-gd: compile into libbluetooth"
Zach Johnson [Wed, 9 Dec 2020 00:39:55 +0000 (00:39 +0000)]
Revert^2 "rusty-gd: compile into libbluetooth"

2cdb386684584e5472b77fd0a1bbf2c8d8d83979

Change-Id: I56860a238c483b55b5eb728eb8cd6cfb6ada4d28

3 years agoConnect main::shim::acl to legacy dumpsys operation am: c5362587d2
Chris Manton [Tue, 8 Dec 2020 06:26:47 +0000 (06:26 +0000)]
Connect main::shim::acl to legacy dumpsys operation am: c5362587d2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8fd80315788c4c368dfde392f86ec360d7e0c69

3 years agoDO NOT MERGE - Merge RQ1A.201205.011
Xin Li [Mon, 7 Dec 2020 03:59:07 +0000 (19:59 -0800)]
DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: I0e8cdb9a00184f62d11fb06bc30f07b2a35bc49e
Change-Id: I7e1304fd99ee313360006f5b9a897de289d3ce2f

3 years agoDO NOT MERGE - Mark RQ1A.201004.001 as merged
Xin Li [Sun, 6 Dec 2020 22:43:22 +0000 (14:43 -0800)]
DO NOT MERGE - Mark RQ1A.201004.001 as merged

Bug: 172690556
Change-Id: I34d9b0eb2cb43984423b2f857bad96bba8acf929

3 years agoConnect main::shim::acl to legacy dumpsys operation
Chris Manton [Tue, 1 Dec 2020 22:11:43 +0000 (14:11 -0800)]
Connect main::shim::acl to legacy dumpsys operation

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I5288fe8eb2f4d9308c896d5c62e99efad35a3e51

3 years agoMerge changes from topic "revert-1512686-LIHRZNOOWL" am: 45f68e0caf
Jeff DeCew [Fri, 4 Dec 2020 19:21:28 +0000 (19:21 +0000)]
Merge changes from topic "revert-1512686-LIHRZNOOWL" am: 45f68e0caf

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

Change-Id: I4f0fbac8df64f165cd609eb4128601c65edede6c

3 years agoMerge changes from topic "revert-1512686-LIHRZNOOWL"
Jeff DeCew [Fri, 4 Dec 2020 18:23:51 +0000 (18:23 +0000)]
Merge changes from topic "revert-1512686-LIHRZNOOWL"

* changes:
  Revert "rusty-gd: compile into libbluetooth"
  Revert "rusty-gd: move init_flag parsing to rust"
  Revert "rusty-gd: add stack start stubs, define shim library"

3 years agoRevert "rusty-gd: compile into libbluetooth"
Jeff DeCew [Fri, 4 Dec 2020 18:05:42 +0000 (18:05 +0000)]
Revert "rusty-gd: compile into libbluetooth"

Revert submission 1512686

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules&lkgb=7010703&lkbb=7011903&fkbb=7010786, bug b/174815635
Bug: 174815635
Reverted Changes:
I163111bc8:rusty-gd: move init_flag parsing to rust
I54cffe93d:rusty-gd: compile into libbluetooth
I5207f4df9:rusty-gd: add stack start stubs, define shim libra...

Change-Id: I0cfbe779c4cad43f92cbf0ffb1a4b9ed75205c72

3 years agoRevert "rusty-gd: move init_flag parsing to rust"
Jeff DeCew [Fri, 4 Dec 2020 18:05:42 +0000 (18:05 +0000)]
Revert "rusty-gd: move init_flag parsing to rust"

Revert submission 1512686

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules&lkgb=7010703&lkbb=7011903&fkbb=7010786, bug b/174815635
Bug: 174815635
Reverted Changes:
I163111bc8:rusty-gd: move init_flag parsing to rust
I54cffe93d:rusty-gd: compile into libbluetooth
I5207f4df9:rusty-gd: add stack start stubs, define shim libra...

Change-Id: I5740575cf7790ed1ab43cc3f521e86f4ef6966e6

3 years agoRevert "rusty-gd: add stack start stubs, define shim library"
Jeff DeCew [Fri, 4 Dec 2020 18:05:42 +0000 (18:05 +0000)]
Revert "rusty-gd: add stack start stubs, define shim library"

Revert submission 1512686

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules&lkgb=7010703&lkbb=7011903&fkbb=7010786, bug b/174815635
Bug: 174815635
Reverted Changes:
I163111bc8:rusty-gd: move init_flag parsing to rust
I54cffe93d:rusty-gd: compile into libbluetooth
I5207f4df9:rusty-gd: add stack start stubs, define shim libra...

Change-Id: I760eea76d21b768acb76b8b9dd7f58c2519e0723

3 years agoMerge changes I5207f4df,I163111bc,I54cffe93 am: e4ecfb54df
Zach Johnson [Fri, 4 Dec 2020 01:37:16 +0000 (01:37 +0000)]
Merge changes I5207f4df,I163111bc,I54cffe93 am: e4ecfb54df

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

Change-Id: Ie2004b5083c23b7f4a40950985d7928378d25ee2

3 years agoMerge changes I5207f4df,I163111bc,I54cffe93
Zach Johnson [Fri, 4 Dec 2020 00:56:48 +0000 (00:56 +0000)]
Merge changes I5207f4df,I163111bc,I54cffe93

* changes:
  rusty-gd: add stack start stubs, define shim library
  rusty-gd: move init_flag parsing to rust
  rusty-gd: compile into libbluetooth

3 years agoAdd stack::test::btm::stack_back_test::InformBtmOnConnection am: 719efc75ef
Chris Manton [Thu, 3 Dec 2020 10:11:14 +0000 (10:11 +0000)]
Add stack::test::btm::stack_back_test::InformBtmOnConnection am: 719efc75ef

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

Change-Id: Idbd85adaae1f8d6c4adda3e79748021177ceda62

3 years agogd: implement APIs of Advertising for Android HCI
Chienyuan [Thu, 3 Dec 2020 08:41:01 +0000 (16:41 +0800)]
gd: implement APIs of Advertising for Android HCI

Tag: #gd-refactor
Bug: 169125803
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: Iddb9d4838f1fde7f151bd491a3a3ffd3bebf2cdf

3 years agogd: Fix flaky tests of LeAddressManager
Chienyuan [Wed, 2 Dec 2020 09:44:55 +0000 (17:44 +0800)]
gd: Fix flaky tests of LeAddressManager

Bug: 174541433
Tag: #gd-refactor
Test: atest bluetooth_test_gd
Change-Id: Ia3af25d2d4c3574c926e18b3d5d5c838316908b7

3 years agoMerge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master
Xin Li [Thu, 3 Dec 2020 03:19:08 +0000 (03:19 +0000)]
Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master

3 years agoAdd stack::test::btm::stack_back_test::InformBtmOnConnection
Chris Manton [Sun, 29 Nov 2020 16:54:52 +0000 (08:54 -0800)]
Add stack::test::btm::stack_back_test::InformBtmOnConnection

Bug: 173769100
Test: net_test_stack_btm
Tag: #refactor

Change-Id: I4a03378bf80369d575c45cfe61345d78cabf7da2

3 years agoMerge changes Ie5e3e056,I48cd10d0,I63bd15ef,I450dc10c am: 58a47975cd
Treehugger Robot [Thu, 3 Dec 2020 02:41:07 +0000 (02:41 +0000)]
Merge changes Ie5e3e056,I48cd10d0,I63bd15ef,I450dc10c am: 58a47975cd

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

Change-Id: I7cae75a4941726f276d6ed42e4107e5b1ac229be

3 years agoMerge changes Ie5e3e056,I48cd10d0,I63bd15ef,I450dc10c
Treehugger Robot [Thu, 3 Dec 2020 02:31:03 +0000 (02:31 +0000)]
Merge changes Ie5e3e056,I48cd10d0,I63bd15ef,I450dc10c

* changes:
  Propagate ACl connected through to BTA uplink
  btm: Add main/shim/acl:: connection history
  Remove unused #def main/shim/dumpsys::BOOL_TEXT
  Add bluetooth::common::StringFormatTime

3 years agoMerge changes from topic "gd_passkey" am: a8fbe06037
Treehugger Robot [Thu, 3 Dec 2020 02:30:51 +0000 (02:30 +0000)]
Merge changes from topic "gd_passkey" am: a8fbe06037

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

Change-Id: I007a921ea20ee6230a3c6ca54cc1ac92922faa3a

3 years agoMerge changes from topic "gd_pin_code" am: 59db3648f0
Treehugger Robot [Thu, 3 Dec 2020 02:30:06 +0000 (02:30 +0000)]
Merge changes from topic "gd_pin_code" am: 59db3648f0

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

Change-Id: Icbc444adcd04034d6e841fd0951565829f05a437

3 years agoPropagate ACl connected through to BTA uplink
Chris Manton [Wed, 25 Nov 2020 20:20:24 +0000 (12:20 -0800)]
Propagate ACl connected through to BTA uplink

Bug: 173769100
Tag: #refactor
Test: gd/cert/run --host

Change-Id: Ie5e3e056118dfa050fe4d90693338e4b614caac0

3 years agoMerge changes from topic "gd_passkey"
Treehugger Robot [Thu, 3 Dec 2020 02:10:00 +0000 (02:10 +0000)]
Merge changes from topic "gd_passkey"

* changes:
  PySecurity: Clarify function name
  Security Passkey: Send passkey from API to controller

3 years agoMerge changes from topic "gd_pin_code"
Treehugger Robot [Thu, 3 Dec 2020 02:04:57 +0000 (02:04 +0000)]
Merge changes from topic "gd_pin_code"

* changes:
  {Py,Cert}Security: Add function to input pin code
  Security: Add pin code methods to Ui interface

3 years agogd ACL: Print warnings for invalid handles
Myles Watson [Thu, 3 Dec 2020 02:02:34 +0000 (18:02 -0800)]
gd ACL: Print warnings for invalid handles

Bug: 174450658
Test: cert/run
Tag: #stability
Change-Id: Ibf9b856f74f20b48149a6db78dcac43194aae296

3 years agorusty-gd: add stack start stubs, define shim library
Zach Johnson [Tue, 1 Dec 2020 19:17:13 +0000 (11:17 -0800)]
rusty-gd: add stack start stubs, define shim library

to avoid duplicate symbols, all CXX FFI integrated into the native code
needs to be from a single library. Move init_flags FFI into libbt_shim
too.

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I5207f4df903cf434b470be84133179b04d5c9483

3 years agobtm: Add main/shim/acl:: connection history
Chris Manton [Wed, 25 Nov 2020 02:38:19 +0000 (18:38 -0800)]
btm: Add main/shim/acl:: connection history

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I48cd10d0d4dee8632614f9b5c74be1f33358dee2

3 years agoRemove unused #def main/shim/dumpsys::BOOL_TEXT
Chris Manton [Wed, 2 Dec 2020 22:29:06 +0000 (14:29 -0800)]
Remove unused #def main/shim/dumpsys::BOOL_TEXT

Use bluetooth::common::ToString(bool)

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I63bd15efd2177ccd4705d27cda4a171215963290

3 years agoAdd bluetooth::common::StringFormatTime
Chris Manton [Wed, 2 Dec 2020 22:28:55 +0000 (14:28 -0800)]
Add bluetooth::common::StringFormatTime

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I450dc10c832a11899e07da372a9cc14b5bef9ee9

3 years agoL2cap shim: clean up namespace am: 29b98651d9
Hansong Zhang [Thu, 3 Dec 2020 00:44:20 +0000 (00:44 +0000)]
L2cap shim: clean up namespace am: 29b98651d9

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

Change-Id: I68734d1becfd0d44435b82f8f79cf4c86d30a6f0

3 years agoL2cap shim: clean up namespace
Hansong Zhang [Tue, 1 Dec 2020 20:53:09 +0000 (12:53 -0800)]
L2cap shim: clean up namespace

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: Ia796ffaae10b8ba7e9bec7864b74954aa545895c

3 years agoMerge changes Icf1a6f56,I1dad4b78,I2ac68e30,Ic7083219 am: 1c26f40b66
Treehugger Robot [Thu, 3 Dec 2020 00:35:16 +0000 (00:35 +0000)]
Merge changes Icf1a6f56,I1dad4b78,I2ac68e30,Ic7083219 am: 1c26f40b66

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

Change-Id: I333ff50126f0e5b7ca20905c040a2fde9d0d7ebf

3 years agoMerge changes Icf1a6f56,I1dad4b78,I2ac68e30,Ic7083219
Treehugger Robot [Thu, 3 Dec 2020 00:04:25 +0000 (00:04 +0000)]
Merge changes Icf1a6f56,I1dad4b78,I2ac68e30,Ic7083219

* changes:
  btm: Indicate scan start/stop
  TEST_MAPPING add net_test_stack_btm
  Land btm control block history
  Use btm_cb Init/Free

3 years agoMerge "Bluetooth: AsyncFdWatcher: Fix FD leak" am: 5b7ad83d30
Treehugger Robot [Wed, 2 Dec 2020 23:39:30 +0000 (23:39 +0000)]
Merge "Bluetooth: AsyncFdWatcher: Fix FD leak" am: 5b7ad83d30

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

Change-Id: If88d436bd65a64f2c2694d2ab62c08fac138e6ef

3 years agorusty-gd: move init_flag parsing to rust
Zach Johnson [Mon, 30 Nov 2020 23:13:35 +0000 (15:13 -0800)]
rusty-gd: move init_flag parsing to rust

all that macro goodness comes to life

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I163111bc87267d8d35ed454c2d9a100f9290f274

3 years ago{Py,Cert}Security: Add function to input pin code
Martin Brabham [Wed, 2 Dec 2020 19:39:41 +0000 (11:39 -0800)]
{Py,Cert}Security: Add function to input pin code

Additionally, update the send_ui_callback to be internal
only.

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

3 years agoMerge "Bluetooth: AsyncFdWatcher: Fix FD leak"
Treehugger Robot [Wed, 2 Dec 2020 22:50:02 +0000 (22:50 +0000)]
Merge "Bluetooth: AsyncFdWatcher: Fix FD leak"

3 years agoPySecurity: Clarify function name
Martin Brabham [Wed, 2 Dec 2020 21:27:56 +0000 (13:27 -0800)]
PySecurity: Clarify function name

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest:test_successful_dut_initiated_ssp_keyboard
Change-Id: Idec264c988c08d118fe5d48a3cc110bcec1468a0

3 years agoSecurity Passkey: Send passkey from API to controller
Martin Brabham [Wed, 2 Dec 2020 19:45:08 +0000 (11:45 -0800)]
Security Passkey: Send passkey from API to controller

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest:test_successful_dut_initiated_ssp_keyboard
Change-Id: I138a7dfa8f1860a258b62751762b07f65ef4b476

3 years agoSecurity: Add pin code methods to Ui interface
Martin Brabham [Tue, 1 Dec 2020 19:06:29 +0000 (11:06 -0800)]
Security: Add pin code methods to Ui interface

Provide functions to allow communication of Ui events
related to PIN Code entry.

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

3 years agorusty-gd: compile into libbluetooth
Zach Johnson [Mon, 30 Nov 2020 17:17:18 +0000 (09:17 -0800)]
rusty-gd: compile into libbluetooth

adds init flag entry point, currently prints flags

disable the BT apex since it's not shipped yet (won't be for a while)
and there are a bajillion rust libraries we'd need to add apex
availibility to.

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I54cffe93d5819ffdc8229aef7be23f260483ab66

3 years agobtm: Indicate scan start/stop
Chris Manton [Wed, 25 Nov 2020 04:14:57 +0000 (20:14 -0800)]
btm: Indicate scan start/stop

Toward loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: Icf1a6f564dc07bf2a530b663f69dcd019bca8903

3 years agoTEST_MAPPING add net_test_stack_btm
Chris Manton [Fri, 27 Nov 2020 17:30:58 +0000 (09:30 -0800)]
TEST_MAPPING add net_test_stack_btm

Towards testable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I1dad4b7844fe9e1ca0906a20c930244ea3e4c9bc

3 years agoLand btm control block history
Chris Manton [Wed, 25 Nov 2020 06:52:27 +0000 (22:52 -0800)]
Land btm control block history

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I2ac68e3096000f77fba83cc378484e6afb7e190b

3 years agoUse btm_cb Init/Free
Chris Manton [Sun, 29 Nov 2020 17:20:56 +0000 (09:20 -0800)]
Use btm_cb Init/Free

Towards life cycle aware code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: Ic7083219045de43d0363e44902ea32b633d26134

3 years agoMerge changes I4a4d6ba5,I719fad7c am: 3b327a173c
Treehugger Robot [Wed, 2 Dec 2020 10:56:47 +0000 (10:56 +0000)]
Merge changes I4a4d6ba5,I719fad7c am: 3b327a173c

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

Change-Id: I470c56b37cc4c3e60008dc217f4a2935a696d20e