OSDN Git Service
Zach Johnson [Tue, 1 Dec 2020 17:11:55 +0000 (17:11 +0000)]
Merge changes Ic0e454d8,I0f324389,Id98b6ad9,Ib17a35a8 am:
fc795ecc6d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1508046
Change-Id: I115d823668624d545ad6cd586811c5d61fa96e64
Zach Johnson [Tue, 1 Dec 2020 16:42:41 +0000 (16:42 +0000)]
Merge changes Ic0e454d8,I0f324389,Id98b6ad9,Ib17a35a8
* changes:
rusty-gd: integrate logging
rusty-gd: make RegistryBuilder follow the builder pattern
rusty-gd: some tidying up of imports & formatting
rusty-gd: swap rootcanal config to a more canonical ordering
Ivan Lozano [Tue, 1 Dec 2020 13:25:51 +0000 (13:25 +0000)]
Merge "Update rust_protobuf proto property." am:
6fed9e68b3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1503433
Change-Id: I3317bed90beb74f961035acaabc526175e583cb3
Ivan Lozano [Tue, 1 Dec 2020 13:11:57 +0000 (13:11 +0000)]
Merge "Update rust_protobuf proto property."
Chris Manton [Tue, 1 Dec 2020 09:18:37 +0000 (09:18 +0000)]
Add various stack/test/common/mock_ am:
8c476e67f9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515034
Change-Id: I33e111addd52eec6ca8da4fdbd76dcedd18c1a27
Chris Manton [Tue, 1 Dec 2020 05:40:07 +0000 (05:40 +0000)]
Explicit use base::Location stack/btu/btu_hcif:: am:
ccaf253fa7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515033
Change-Id: Ie7af402aa9c18552ff1760418fc4205d94cf9c5c
Chris Manton [Tue, 1 Dec 2020 05:40:03 +0000 (05:40 +0000)]
enum-ify fixed_cid stack/include/l2cdefs::L2CAP_ am:
2ca3009b73
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515031
Change-Id: I544506b1b9ad97543fd3cde4b28ae2f25d2e8393
Chris Manton [Tue, 1 Dec 2020 05:39:27 +0000 (05:39 +0000)]
Canonicalize include files am:
f035871c7c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515030
Change-Id: If178c9245ecda53d9f2f316804d214b680d48218
Chris Manton [Sun, 29 Nov 2020 00:01:10 +0000 (16:01 -0800)]
Add various stack/test/common/mock_
Surface area endpoints for btm modules.
Mostly generated from corresponding source.
Bug:
174401903
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I322a51d29cc750f8a61c91f620a4dd544b3773ff
Treehugger Robot [Tue, 1 Dec 2020 04:20:24 +0000 (04:20 +0000)]
Merge "btaa: update hardware include file to be gd ready" am:
12a230676e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1508616
Change-Id: I78e9b77ca860e77d9664d02ee7c5838d4bed6704
Chris Manton [Sat, 28 Nov 2020 17:29:56 +0000 (09:29 -0800)]
Explicit use base::Location stack/btu/btu_hcif::
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I6461b403d2cb0adff6f0e88bc8dd3df189e4514a
Chris Manton [Thu, 19 Nov 2020 16:48:46 +0000 (08:48 -0800)]
enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: If792e68c92adb0431526942ac4f9274b1d1db45f
Chris Manton [Fri, 27 Nov 2020 02:09:27 +0000 (18:09 -0800)]
Canonicalize include files
Altering makefiles triggers a significant rebuild of the
entire Android make system.
Altering source code does not.
Towards buildable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ibe479c0c0d3cbe413f4c5e624a7fb69a7131d14b
Treehugger Robot [Tue, 1 Dec 2020 03:50:16 +0000 (03:50 +0000)]
Merge "btaa: update hardware include file to be gd ready"
Zach Johnson [Mon, 23 Nov 2020 17:53:59 +0000 (09:53 -0800)]
rusty-gd: integrate logging
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ic0e454d8490d08a645bbab86f86f102c0d7784ad
Zach Johnson [Thu, 19 Nov 2020 21:05:53 +0000 (13:05 -0800)]
rusty-gd: make RegistryBuilder follow the builder pattern
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I0f32438926212a99a10d429922cc046d49b86860
Zach Johnson [Thu, 19 Nov 2020 19:26:43 +0000 (11:26 -0800)]
rusty-gd: some tidying up of imports & formatting
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Id98b6ad953908de110ad34c6443d6812588332c5
Zach Johnson [Thu, 19 Nov 2020 19:17:13 +0000 (11:17 -0800)]
rusty-gd: swap rootcanal config to a more canonical ordering
also, add helper to tidy up creating a socket addr from it
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Ib17a35a82bb78fb4ed21c03c88bd67466ef5d133
Marco Ballesio [Tue, 1 Dec 2020 01:01:58 +0000 (01:01 +0000)]
Merge changes from topic "revert-
1512835-CUDUBMDOSD" am:
1834974653
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1514740
Change-Id: I5fabc301931d0f037434f2b3bae6b4735e0a11a7
Treehugger Robot [Tue, 1 Dec 2020 01:00:46 +0000 (01:00 +0000)]
Merge "hci: Remove SimultaneousLeHost bit" am:
a09c5f4b51
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1511153
Change-Id: Ib0d734b147dfc2858eef84b7f6c5313d0d6d571a
Marco Ballesio [Tue, 1 Dec 2020 00:56:57 +0000 (00:56 +0000)]
Merge changes from topic "revert-
1512835-CUDUBMDOSD"
* changes:
Revert "Canonicalize include files"
Revert "enum-ify fixed_cid stack/include/l2cdefs::L2CAP_"
Revert "Introduce net_test_stack_btm"
Revert "Explicit use base::Location stack/btu/btu_hcif::"
Revert "Add various stack/test/common/mock_"
Marco Ballesio [Tue, 1 Dec 2020 00:37:48 +0000 (00:37 +0000)]
Revert "Canonicalize include files"
Revert submission
1512835
Reason for revert: DroidMonitor-triggered revert due to breakages:
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=
7002434&lkbb=
7002649&fkbb=
7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=
7002643&lkbb=
7002696&fkbb=
7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=
7002604&lkbb=
7002703&fkbb=
7002696
bug http://b/
174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_
Change-Id: Id8ac53b579aa5972daaa908e7b8eed62d258d0f6
Marco Ballesio [Tue, 1 Dec 2020 00:37:48 +0000 (00:37 +0000)]
Revert "enum-ify fixed_cid stack/include/l2cdefs::L2CAP_"
Revert submission
1512835
Reason for revert: DroidMonitor-triggered revert due to breakages:
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=
7002434&lkbb=
7002649&fkbb=
7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=
7002643&lkbb=
7002696&fkbb=
7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=
7002604&lkbb=
7002703&fkbb=
7002696
bug http://b/
174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_
Change-Id: Id3a41ef1f1b0ee0c75f0fd44358b929a2f39b2db
Marco Ballesio [Tue, 1 Dec 2020 00:37:48 +0000 (00:37 +0000)]
Revert "Introduce net_test_stack_btm"
Revert submission
1512835
Reason for revert: DroidMonitor-triggered revert due to breakages:
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=
7002434&lkbb=
7002649&fkbb=
7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=
7002643&lkbb=
7002696&fkbb=
7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=
7002604&lkbb=
7002703&fkbb=
7002696
bug http://b/
174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_
Change-Id: Id0a3ef185f16f8e229923f684ae12d88082e4b66
Marco Ballesio [Tue, 1 Dec 2020 00:37:48 +0000 (00:37 +0000)]
Revert "Explicit use base::Location stack/btu/btu_hcif::"
Revert submission
1512835
Reason for revert: DroidMonitor-triggered revert due to breakages:
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=
7002434&lkbb=
7002649&fkbb=
7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=
7002643&lkbb=
7002696&fkbb=
7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=
7002604&lkbb=
7002703&fkbb=
7002696
bug http://b/
174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_
Change-Id: I7d8eb39fde70160b1a3dbb0e47e1b36806023543
Marco Ballesio [Tue, 1 Dec 2020 00:37:48 +0000 (00:37 +0000)]
Revert "Add various stack/test/common/mock_"
Revert submission
1512835
Reason for revert: DroidMonitor-triggered revert due to breakages:
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_phone-userdebug&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=sdk_x86_64-sdk&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=
7002541&lkbb=
7002623&fkbb=
7002623
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=
7002434&lkbb=
7002649&fkbb=
7002649
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=
7002643&lkbb=
7002696&fkbb=
7002696
https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-d1-dev-plus-aosp&target=docs&lkgb=
7002604&lkbb=
7002703&fkbb=
7002696
bug http://b/
174517408
Reverted Changes:
Ieb002c783:Canonicalize include files
I69d5dff4f:enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
I5a52498ad:Introduce net_test_stack_btm
I6a637b5e2:Explicit use base::Location stack/btu/btu_hcif::
I23c831a61:Add various stack/test/common/mock_
Change-Id: I20453ad181475add66594787b01649f5b687ab21
Treehugger Robot [Tue, 1 Dec 2020 00:21:50 +0000 (00:21 +0000)]
Merge "hci: Remove SimultaneousLeHost bit"
Treehugger Robot [Tue, 1 Dec 2020 00:17:48 +0000 (00:17 +0000)]
Merge changes I23c831a6,I6a637b5e,I5a52498a,I69d5dff4,Ieb002c78 am:
e53c3a7a12
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512835
Change-Id: I6d006f9a9b79d42edcdc4e65331883c0aa1e585d
Hansong Zhang [Tue, 1 Dec 2020 00:15:08 +0000 (00:15 +0000)]
ACL: Fix on_connection_packet_type_changed am:
341f9ff336
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1513258
Change-Id: I2bdd9f99dd075505ab2cdc051218ffd39a499ce1
Treehugger Robot [Mon, 30 Nov 2020 23:29:51 +0000 (23:29 +0000)]
Merge changes I23c831a6,I6a637b5e,I5a52498a,I69d5dff4,Ieb002c78
* changes:
Add various stack/test/common/mock_
Explicit use base::Location stack/btu/btu_hcif::
Introduce net_test_stack_btm
enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
Canonicalize include files
Hansong Zhang [Mon, 30 Nov 2020 19:39:18 +0000 (11:39 -0800)]
ACL: Fix on_connection_packet_type_changed
This could happen before Connection Complete event is received from
controller.
We never did anything about it in legacy stack.
(HCI_CONN_PKT_TYPE_CHANGE_EVT is unused)
Bug:
174450658
Test: cert/run
Tag: #stability
Change-Id: Ia33dfb358988ebbd45abd66b9115e8529cf27d43
Chris Manton [Sun, 29 Nov 2020 00:01:10 +0000 (16:01 -0800)]
Add various stack/test/common/mock_
Surface area endpoints for btm modules.
Mostly generated from corresponding source.
Bug:
174401903
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I23c831a618a1875986db959a458263b08ad4b443
Chris Manton [Sat, 28 Nov 2020 17:29:56 +0000 (09:29 -0800)]
Explicit use base::Location stack/btu/btu_hcif::
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I6a637b5e2a8faec8766084f1624e5f76840d27dd
Chris Manton [Thu, 26 Nov 2020 00:38:18 +0000 (16:38 -0800)]
Introduce net_test_stack_btm
Towards testable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I5a52498ad8a19793ad38263224ebb9ab1434a7af
Chris Manton [Thu, 19 Nov 2020 16:48:46 +0000 (08:48 -0800)]
enum-ify fixed_cid stack/include/l2cdefs::L2CAP_
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I69d5dff4fded205bbc062066a36fa026ec48bf9e
Chris Manton [Fri, 27 Nov 2020 02:09:27 +0000 (18:09 -0800)]
Canonicalize include files
Altering makefiles triggers a significant rebuild of the
entire Android make system.
Altering source code does not.
Towards buildable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ieb002c783cdfb1d0e794cbfeed0deaa449c83609
Hansong Zhang [Mon, 30 Nov 2020 21:21:21 +0000 (21:21 +0000)]
L2cap classic shim: Use new helper am:
b17f980658
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1507716
Change-Id: I8fff11f021f00ec49bf42669e45c49696e316259
Myles Watson [Wed, 25 Nov 2020 14:47:16 +0000 (06:47 -0800)]
hci: Remove SimultaneousLeHost bit
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: Icba7c475e037cf850a3138a6f0c9a61e99bfd5be
Treehugger Robot [Mon, 30 Nov 2020 18:47:26 +0000 (18:47 +0000)]
Merge "RootCanal: Use PIN pairing if no SSP" am:
8fb394e545
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1511152
Change-Id: I78225ab1c235c48a664ac531ed21f4b508287486
Hansong Zhang [Fri, 20 Nov 2020 00:41:22 +0000 (16:41 -0800)]
L2cap classic shim: Use new helper
Fixes to the new shim, including thread sync, shim redirection in ACL
shim, security level settings.
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: Ia66a968b545eed843552d1ee9953adf1f9f57c9d
Treehugger Robot [Mon, 30 Nov 2020 18:23:26 +0000 (18:23 +0000)]
Merge "RootCanal: Use PIN pairing if no SSP"
Treehugger Robot [Thu, 26 Nov 2020 05:20:42 +0000 (05:20 +0000)]
Merge "Migrate bluetooth imports to proto_logging" am:
99bd08fc96
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1508752
Change-Id: Idba2fec2e521ce22bb675b6f8db0c1034fd43fa9
Treehugger Robot [Thu, 26 Nov 2020 05:13:18 +0000 (05:13 +0000)]
Merge "Migrate bluetooth imports to proto_logging"
Chienyuan [Thu, 26 Nov 2020 05:10:49 +0000 (05:10 +0000)]
gd HCI: Do not reset alarm when unregister_client am:
a509f04a6e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1511088
Change-Id: I7979bb52c13be28ca69018383e852f9a2bc24fec
Myles Watson [Wed, 25 Nov 2020 14:21:39 +0000 (06:21 -0800)]
RootCanal: Use PIN pairing if no SSP
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: Ibfdb69449f760fa67e3020955d584571b153bf35
Chienyuan [Wed, 25 Nov 2020 09:31:40 +0000 (17:31 +0800)]
gd HCI: Do not reset alarm when unregister_client
Tag: #gd-refactor
Bug:
173770236
Test: cert/run --host;
Change-Id: I715bcf366db4845d6e84d88e97b95f9bd230c97d
Treehugger Robot [Tue, 24 Nov 2020 22:53:16 +0000 (22:53 +0000)]
Merge "gd: implement APIs of Advertising for Legacy" am:
91b0f3955f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1509729
Change-Id: I35c774c0d53d11ce76a19e0532b8f1411192bf74
Treehugger Robot [Tue, 24 Nov 2020 22:27:08 +0000 (22:27 +0000)]
Merge "gd: implement APIs of Advertising for Legacy"
Jeffrey Huang [Fri, 20 Nov 2020 20:01:19 +0000 (12:01 -0800)]
Migrate bluetooth imports to proto_logging
These enums are being migrated to proto_logging to decouple atoms.proto from statsd.
Bug:
167962588
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I034d91894564010862b3bd0a4035e3e532a814b1
Merged-In: I034d91894564010862b3bd0a4035e3e532a814b1
Hansong Zhang [Tue, 24 Nov 2020 18:48:51 +0000 (18:48 +0000)]
L2cap shim: Remove unused API am:
d2aea9cd89
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1506629
Change-Id: I375e03b00ca225282988f6c6e3637c1c7609ac0f
Hansong Zhang [Fri, 20 Nov 2020 00:14:48 +0000 (16:14 -0800)]
L2cap shim: Remove unused API
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Change-Id: I02b5f3779b37cdfa5426df0a447016a86a34c3bc
Zach Johnson [Tue, 24 Nov 2020 17:56:40 +0000 (17:56 +0000)]
Merge changes I560edb20,Id8f90a59,If35e7bfc am:
910340ddc5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1506276
Change-Id: Iddaf6dde7584e131e176b06aa1f1fe52b6f48435
Treehugger Robot [Tue, 24 Nov 2020 17:56:29 +0000 (17:56 +0000)]
Merge changes Iac8f6a8e,I85f0dac1 am:
84a0fcd56d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1500988
Change-Id: I405cf1ab702de675ffa86aaddb0ab74dee8de003
Treehugger Robot [Tue, 24 Nov 2020 17:55:35 +0000 (17:55 +0000)]
Merge changes I738f2a13,Id0f99289,Iefd5b0c7,I61013efd,I6f8b8ae8, ... am:
75e431f37c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1509220
Change-Id: Ied4d29f72fc339021a5fb0da43cb6d29b21c1105
Michael Sun [Mon, 23 Nov 2020 05:48:53 +0000 (05:48 +0000)]
btaa: update hardware include file to be gd ready
Move Activity enum inside ActivityAttributionCallbacks class as this
include file will not cross boundary and be available for the btaa
module within the gd. Rename the Init() function, as btaa within gd
will be modularized, hence the stack will be responsible for the
initialization.
Tag: #feature
Bug:
172501038
Test: m
Change-Id: I371de5399abbfb0929baff0695ea1608e2341347
Zach Johnson [Tue, 24 Nov 2020 17:20:28 +0000 (17:20 +0000)]
Merge changes I560edb20,Id8f90a59,If35e7bfc
* changes:
rusty-gd: some tidying up in rootcanal_hal
rusty-gd: Add cxx interop layer for the BT HIDL HAL
eusty-gd: Add timerfd-based timing abstractions
Treehugger Robot [Tue, 24 Nov 2020 17:19:53 +0000 (17:19 +0000)]
Merge changes Iac8f6a8e,I85f0dac1
* changes:
rusty-gd: GDDI now caches instances & allows injecting config
rusty-gd: initial commit for GDDI
Treehugger Robot [Tue, 24 Nov 2020 17:15:06 +0000 (17:15 +0000)]
Merge changes I738f2a13,Id0f99289,Iefd5b0c7,I61013efd,I6f8b8ae8, ...
* changes:
acl_disconnect_after_role_switch:Check for valid acl
enum-ify stack/gatt/gatt_int::GATT_CH_STATE
Catch and release ignored btif gatt events
Remove unused #def stack/include/gatt_api::GATT_CONN_FAIL_ESTABLISH
Add LOG_DUMPSYS[_TITLE]
gd: Add acl manager dumpsys data
Introduce btm circular buffer history
Add hci error code ROLE_SWITCH_FAILED
Flush out BtaIdSysText
Remove unused #include
Proper const API for stack/include/bt_type::bd_features_text
Add stack/l2cap/l2c_int::link_state_text
Expose shim acl remote address accessors
Re-log stack/l2cap/l2c_api::L2CA_RegisterLECoc
Re-log stack/l2cap/l2c_api::L2CA_Register
Chienyuan [Tue, 24 Nov 2020 11:54:14 +0000 (19:54 +0800)]
gd: implement APIs of Advertising for Legacy
Tag: #gd-refactor
Bug:
169125803
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: I317b75c93619f99df6ff40b46fbb44c23e21f437
Jakub Pawlowski [Tue, 24 Nov 2020 09:56:53 +0000 (09:56 +0000)]
Merge "btm: Add API to check peer's 2M PHY support" am:
e3f86b2b31
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1508117
Change-Id: I7b99832132eb9c426073966d764ecb3468bf38e4
Łukasz Rymanowski [Tue, 24 Nov 2020 09:55:31 +0000 (09:55 +0000)]
btsnoop_net: Fix instruction for btsnoop logs am:
b43585cdca
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1337175
Change-Id: Ibb7b5d8df4e45f4db047d8c83557f7e7749fa76c
Michael Sun [Tue, 24 Nov 2020 09:53:17 +0000 (09:53 +0000)]
Merge "btaa: undo btaa implementation is fluoride stack" am:
76555c9274
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1508037
Change-Id: Ie5f099e21d67c9552210657ab87e5ab2e5b57f22
Jakub Pawlowski [Tue, 24 Nov 2020 08:26:58 +0000 (08:26 +0000)]
Merge "btm: Add API to check peer's 2M PHY support"
Łukasz Rymanowski [Fri, 8 May 2020 23:08:56 +0000 (01:08 +0200)]
btsnoop_net: Fix instruction for btsnoop logs
Change-Id: Ib014a39f108c7e947f0bbf589d6c3c8b15d4bb7d
Michael Sun [Tue, 24 Nov 2020 07:19:51 +0000 (07:19 +0000)]
Merge "btaa: undo btaa implementation is fluoride stack"
Chris Manton [Mon, 23 Nov 2020 22:54:36 +0000 (14:54 -0800)]
acl_disconnect_after_role_switch:Check for valid acl
Bug:
173763477
Test: gd/cert/run --host
Tag: #refactor
Change-Id: I738f2a13e3378bc924315eff9ef9ffb95be20af7
Chris Manton [Thu, 19 Nov 2020 21:57:40 +0000 (13:57 -0800)]
enum-ify stack/gatt/gatt_int::GATT_CH_STATE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Id0f99289b4919211056d6565abe293b0b4eee179
Chris Manton [Thu, 12 Nov 2020 23:41:18 +0000 (15:41 -0800)]
Catch and release ignored btif gatt events
Prevents false logging errors
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Iefd5b0c748f61f79c87d23b2da37f285b4df1a96
Chris Manton [Wed, 18 Nov 2020 20:58:39 +0000 (12:58 -0800)]
Remove unused #def stack/include/gatt_api::GATT_CONN_FAIL_ESTABLISH
Towards readable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I61013efd964bffd125990fe3031a58fa8a3a68a3
Chris Manton [Sun, 22 Nov 2020 22:48:52 +0000 (14:48 -0800)]
Add LOG_DUMPSYS[_TITLE]
Toward loggable code
Bug:
163134718
Tag: #refactor
Test: CtsVerifier
Change-Id: I6f8b8ae83c220324c5f99ce1f06178c13803913d
Chris Manton [Sun, 22 Nov 2020 02:58:55 +0000 (18:58 -0800)]
gd: Add acl manager dumpsys data
Toward loggable code
Bug:
163134718
Tag: #refactor
Test: CtsVerifier
Change-Id: I4f47237754a9d16d1653f24a9d223b2a42f97543
Chris Manton [Mon, 23 Nov 2020 23:23:38 +0000 (15:23 -0800)]
Introduce btm circular buffer history
Toward loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: If9ed3213f8a8a96a1ea5d6ad530c7952bf312346
Chris Manton [Mon, 23 Nov 2020 23:08:30 +0000 (15:08 -0800)]
Add hci error code ROLE_SWITCH_FAILED
Seen in the wild with Bose soundtouch
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I29007526787876f148d664d95ffadaa5e52551d0
Chris Manton [Mon, 23 Nov 2020 22:54:26 +0000 (14:54 -0800)]
Flush out BtaIdSysText
All active bta services seen in the wild
Toward loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Ifafad64e23013bac9f2df1ef13292549bbd13404
Chris Manton [Sun, 22 Nov 2020 22:48:32 +0000 (14:48 -0800)]
Remove unused #include
Toward readable code
Bug:
163134718
Tag: #refactor
Test: CtsVerifier
Change-Id: I0c1262f796c633242313fd7b507d315ebfc618d3
Chris Manton [Sun, 22 Nov 2020 17:00:47 +0000 (09:00 -0800)]
Proper const API for stack/include/bt_type::bd_features_text
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I2d9700ce398963bfe90602d995ea4faedf082329
Chris Manton [Fri, 20 Nov 2020 20:31:46 +0000 (12:31 -0800)]
Add stack/l2cap/l2c_int::link_state_text
Toward loggable code
Bug:
163134718
Tag: #refactor
Test: CtsVerifier
Change-Id: If32f14beece68e85f7cbf345a3f694c1f2553bdb
Chris Manton [Mon, 23 Nov 2020 05:30:59 +0000 (21:30 -0800)]
Expose shim acl remote address accessors
Bug:
166280067
Test: gd/cert/run --host
Tag: #refactor
Change-Id: Icb1d16d5982f065faf88edd19c8b6e1880546d48
Chris Manton [Sat, 14 Nov 2020 00:38:01 +0000 (16:38 -0800)]
Re-log stack/l2cap/l2c_api::L2CA_RegisterLECoc
Toward loggable code
Bug:
163134718
Tag: #refactor
Test: CtsVerifier
Change-Id: Ifd0cf6aff270624dfe5968b02ffe58f8994d823f
Chris Manton [Sat, 14 Nov 2020 00:46:50 +0000 (16:46 -0800)]
Re-log stack/l2cap/l2c_api::L2CA_Register
Toward loggable code
Bug:
163134718
Tag: #refactor
Test: CtsVerifier
Change-Id: I8e3f8f5e3154a03eb23fd74806424c25cbde5d25
Treehugger Robot [Tue, 24 Nov 2020 03:44:21 +0000 (03:44 +0000)]
Merge "gd: LE Advertising manager fragmentation" am:
c94c17213f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1501930
Change-Id: Ica99e1cb212bbed6ed47d759356eb14a109ab77c
Hansong Zhang [Tue, 24 Nov 2020 03:44:12 +0000 (03:44 +0000)]
L2cap shim: Introduce Classic Dynamic Channel Helper am:
d67452503c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1506628
Change-Id: Iebe4631b71642369a6aab9e2a74ed3b276b5d4b3
Treehugger Robot [Tue, 24 Nov 2020 03:25:52 +0000 (03:25 +0000)]
Merge "gd: LE Advertising manager fragmentation"
Zach Johnson [Thu, 19 Nov 2020 19:08:47 +0000 (11:08 -0800)]
rusty-gd: some tidying up in rootcanal_hal
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I560edb20f8a79d766417ebee7972bc6e43be4718
Zach Johnson [Thu, 19 Nov 2020 04:29:56 +0000 (20:29 -0800)]
rusty-gd: Add cxx interop layer for the BT HIDL HAL
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Id8f90a59bdce36224d9de2a05746227a69dc24fb
Zach Johnson [Wed, 18 Nov 2020 17:18:53 +0000 (09:18 -0800)]
eusty-gd: Add timerfd-based timing abstractions
Meant to feel similar to tokio's timing abstractions, but can wake the
system
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: If35e7bfc75a2a15bbd5dc940c0ba03fcdb2b6d4a
Zach Johnson [Tue, 17 Nov 2020 05:50:49 +0000 (21:50 -0800)]
rusty-gd: GDDI now caches instances & allows injecting config
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: Iac8f6a8edc5aa4ee94c33d20d11a23c9906d0b34
Zach Johnson [Mon, 16 Nov 2020 22:43:06 +0000 (14:43 -0800)]
rusty-gd: initial commit for GDDI
go/gddi for an overview
GDDI (GD dependency injection) aims to solve the issue
of start & stop order, especially in the world where we
bring the stack up partially for testing.
this patch introduces modules & providers, but does not yet save
& remember instances to prevent multiple calls, or provide a way
to seed some object instances (e.g. config), or provide a way to
tear down the started objects
The rest is coming soon.
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I85f0dac139cfab3174053b92e077c80245da4f85
Hansong Zhang [Mon, 23 Nov 2020 22:01:09 +0000 (22:01 +0000)]
L2cap shim namespace clean up am:
530fdc6980
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1506627
Change-Id: I7decc2dc32ebbc39db16467874a3d35570574de0
Hansong Zhang [Mon, 23 Nov 2020 21:58:29 +0000 (21:58 +0000)]
GD L2cap shim workaround am:
d5f930abe8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1502166
Change-Id: I76862f27bb122de28df432285f8e29228906a304
Hansong Zhang [Fri, 20 Nov 2020 00:13:02 +0000 (16:13 -0800)]
L2cap shim: Introduce Classic Dynamic Channel Helper
Same as LE.
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Change-Id: Ie9c85f5bdadf5235095d357ae77d1668d7fcc694
Hansong Zhang [Thu, 19 Nov 2020 23:51:43 +0000 (15:51 -0800)]
L2cap shim namespace clean up
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Change-Id: Id1b152a6f679b5141c1ae80eab0696d6dafe6087
Hansong Zhang [Wed, 18 Nov 2020 02:38:37 +0000 (18:38 -0800)]
GD L2cap shim workaround
* Fix a workflow in classic security enforcement
* Use the ACL workaround for address policy
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: I31e439ae40f0db98aeed10ec6872a1f25c4f94d0
Zach Johnson [Mon, 23 Nov 2020 21:37:05 +0000 (21:37 +0000)]
rusty-gd: properly read ACL data from the HAL am:
55fc3947e9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1499267
Change-Id: I4e54b30401c0c2fea8cf27e7872cae6e5b5254b4
Zach Johnson [Sun, 15 Nov 2020 00:34:07 +0000 (16:34 -0800)]
rusty-gd: properly read ACL data from the HAL
Bug:
171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: Ic6ed193f89a689a255820704b606b8ffb03a9ee0
Zach Johnson [Mon, 23 Nov 2020 20:17:53 +0000 (20:17 +0000)]
Merge changes Ib8d0227e,I2bcd02ea am:
063b7654e9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1507896
Change-Id: I6729251b41e12e33ce7cb02fa73671d5fd2caa0a
Zach Johnson [Mon, 23 Nov 2020 19:28:11 +0000 (19:28 +0000)]
Merge changes Ib8d0227e,I2bcd02ea
* changes:
rusty-packets: rename packets & add packet child enums
rusty-packets: stub out struct & packet generation
Zach Johnson [Mon, 23 Nov 2020 18:24:41 +0000 (18:24 +0000)]
Merge "rusty-packets: generate sample enums and make this work end to end" am:
fbdba4beb2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1506848
Change-Id: I9d9de14fa226271ba588bef53861e196d4bd680a
Michael Sun [Mon, 23 Nov 2020 07:07:01 +0000 (07:07 +0000)]
btaa: undo btaa implementation is fluoride stack
Undo most btaa implementation in the fluoride stack to get ready for
migrating to gd.
Tag: #feature
Bug:
172501038
Test: m
Change-Id: Ibd696edd95ab4eb73ab2387114eca3af14ea66d8
Zach Johnson [Mon, 23 Nov 2020 17:47:44 +0000 (17:47 +0000)]
Merge "rusty-packets: generate sample enums and make this work end to end"
OSDN Git Service
