OSDN Git Service
Hansong Zhang [Tue, 1 Dec 2020 22:43:41 +0000 (22:43 +0000)]
Refactor LE dynamic psm assignment am:
c846c3bae0 am:
e6a159b11b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1510510
Change-Id: I5910ae432d46b4b2c6194c3fef05e637f5cb9f65
Hansong Zhang [Tue, 1 Dec 2020 22:30:57 +0000 (22:30 +0000)]
Refactor LE dynamic psm assignment am:
c846c3bae0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1510510
Change-Id: Icee49bbacb2ad6e6b7fada7c0616f2b894a00e26
Chris Manton [Tue, 1 Dec 2020 22:25:23 +0000 (22:25 +0000)]
Properly route acl disconnect am:
83c48080c8 am:
83b397773c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512840
Change-Id: Ib5314de9f8d13e2412b2be3ed230c87414e3dd0c
Chris Manton [Tue, 1 Dec 2020 22:25:21 +0000 (22:25 +0000)]
Add stack/btm/btm_main::btm_free am:
f822a6b195 am:
a3a25b9cdc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512839
Change-Id: Iade09082106aa5fbb9b28bd2e4c9bb41b665f47a
Chris Manton [Tue, 1 Dec 2020 22:25:18 +0000 (22:25 +0000)]
Add stack/btm/btm_inq::btm_inq_db_free am:
4b5aab9cb9 am:
63ed313b94
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512838
Change-Id: I0d7fd377d1bb8c50c8f20399d54be2d12c92e0d3
Chris Manton [Tue, 1 Dec 2020 22:25:17 +0000 (22:25 +0000)]
Add stack/btm/btm_devctl::btm_dev_free am:
7c7b5703e3 am:
68e6275598
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512837
Change-Id: I085def57653253371d6366ba7f8fc3cb71eeda0b
Chris Manton [Tue, 1 Dec 2020 22:25:14 +0000 (22:25 +0000)]
Memory leak fix for osi alarm am:
e83a68f8ed am:
ae4473970b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512836
Change-Id: Idb69db76f581329f079b43ef3f2ec0f8d66f80a0
Hansong Zhang [Tue, 24 Nov 2020 21:14:57 +0000 (13:14 -0800)]
Refactor LE dynamic psm assignment
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Test: CtsVerifier
Change-Id: If6d421a84b3978a564e5fb5da4bb97f0d440b1fe
Chris Manton [Tue, 1 Dec 2020 20:30:08 +0000 (20:30 +0000)]
Properly route acl disconnect am:
83c48080c8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512840
Change-Id: I7476cd63c6dcc9597aa46cbf072f1a3f164872c1
Chris Manton [Tue, 1 Dec 2020 20:30:05 +0000 (20:30 +0000)]
Add stack/btm/btm_main::btm_free am:
f822a6b195
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512839
Change-Id: I86a9791aaebb0287080dcaa7fc2bfcb06f459e33
Chris Manton [Tue, 1 Dec 2020 20:30:01 +0000 (20:30 +0000)]
Add stack/btm/btm_inq::btm_inq_db_free am:
4b5aab9cb9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512838
Change-Id: I5ddf83aeeb5f503fc190c55dfe3f7dafa6b76007
Chris Manton [Tue, 1 Dec 2020 20:29:58 +0000 (20:29 +0000)]
Add stack/btm/btm_devctl::btm_dev_free am:
7c7b5703e3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512837
Change-Id: I3b982e6ace9d2e37621ae1cb11edf8a3c281e080
Chris Manton [Tue, 1 Dec 2020 20:29:54 +0000 (20:29 +0000)]
Memory leak fix for osi alarm am:
e83a68f8ed
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512836
Change-Id: Idcc0609416f11b12092f7796de0d3e284f95dda2
Treehugger Robot [Tue, 1 Dec 2020 18:58:00 +0000 (18:58 +0000)]
Merge "Introduce net_test_stack_btm" am:
8fdf6ee1ca am:
518fee6de2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515032
Change-Id: I899d6fe569c96350e460325d99ace99e71f0aa82
Chris Manton [Wed, 25 Nov 2020 16:30:05 +0000 (08:30 -0800)]
Properly route acl disconnect
Disconnect should come directly into the acl module.
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I2edaec9b29df322169b64ca1c12537af713e8c4c
Chris Manton [Fri, 27 Nov 2020 07:12:49 +0000 (23:12 -0800)]
Add stack/btm/btm_main::btm_free
Towards life cycle aware code
Bug:
174401900
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I71d8c1dc32b6ca3b94b5ae0c90b4134975a4e0b0
Chris Manton [Fri, 27 Nov 2020 07:12:18 +0000 (23:12 -0800)]
Add stack/btm/btm_inq::btm_inq_db_free
Towards life cycle aware code
Bug:
174401900
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I019a40e863dd2b191ba37e3ab19f932fb74016a8
Chris Manton [Fri, 27 Nov 2020 07:11:51 +0000 (23:11 -0800)]
Add stack/btm/btm_devctl::btm_dev_free
Towards life cycle aware code
Bug:
174401900
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I5476c569e35242fb5079e0afecf717d55e02a64e
Chris Manton [Fri, 27 Nov 2020 07:10:36 +0000 (23:10 -0800)]
Memory leak fix for osi alarm
Bug:
174399290
Test: net_test_stack_btm
Tag: #refactor
Change-Id: I473b5608b5f0e2096fa69825aa9e7f612835ff62
Treehugger Robot [Tue, 1 Dec 2020 18:42:26 +0000 (18:42 +0000)]
Merge "Introduce net_test_stack_btm" am:
8fdf6ee1ca
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515032
Change-Id: I8dde3a898ecef97cdf914295fa7ce689b9562c23
Treehugger Robot [Tue, 1 Dec 2020 18:30:48 +0000 (18:30 +0000)]
Merge "Introduce net_test_stack_btm"
Zach Johnson [Tue, 1 Dec 2020 17:30:12 +0000 (17:30 +0000)]
Merge changes Ic0e454d8,I0f324389,Id98b6ad9,Ib17a35a8 am:
fc795ecc6d am:
f7fb49846e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1508046
Change-Id: I3400e1817d44b4ff01be26e29fa2fed541e7dd3b
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
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: Ifcd3424bf95794037d8d87d68857feef137190e7
Ivan Lozano [Tue, 1 Dec 2020 13:59:21 +0000 (13:59 +0000)]
Merge "Update rust_protobuf proto property." am:
6fed9e68b3 am:
4e5a5bcd28
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1503433
Change-Id: Icafe8f624241418c81835ca22d94d3f19fc51224
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:34:12 +0000 (09:34 +0000)]
Add various stack/test/common/mock_ am:
8c476e67f9 am:
73da988999
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515034
Change-Id: Ibb91a107ec8832c636232d6486e37bb1a300937d
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:59:32 +0000 (05:59 +0000)]
Explicit use base::Location stack/btu/btu_hcif:: am:
ccaf253fa7 am:
e885a54930
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515033
Change-Id: I9ed8a7c108c91c8900e4180dcc95f8130a5c27dd
Chris Manton [Tue, 1 Dec 2020 05:59:30 +0000 (05:59 +0000)]
enum-ify fixed_cid stack/include/l2cdefs::L2CAP_ am:
2ca3009b73 am:
e475f3ec1f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515031
Change-Id: I5e2b94f354ccbfe75a9d5029e3dfa568d63d9bac
Chris Manton [Tue, 1 Dec 2020 05:59:28 +0000 (05:59 +0000)]
Canonicalize include files am:
f035871c7c am:
b20d60828f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515030
Change-Id: I9a72e63935dd3a549b858c0cb5b4c625e63f49ce
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:35:10 +0000 (04:35 +0000)]
Merge "btaa: update hardware include file to be gd ready" am:
12a230676e am:
9891643abe
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1508616
Change-Id: I0b1799252b99c68c5d198e306a65add663b5c532
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"
Marco Ballesio [Tue, 1 Dec 2020 01:06:13 +0000 (01:06 +0000)]
Merge changes from topic "revert-
1512835-CUDUBMDOSD" am:
1834974653 am:
19e64e030b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1514740
Change-Id: Ie72c04d2ddb202afb935b5ccf909bee554855f81
Treehugger Robot [Tue, 1 Dec 2020 01:06:07 +0000 (01:06 +0000)]
Merge "hci: Remove SimultaneousLeHost bit" am:
a09c5f4b51 am:
f03133aac6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1511153
Change-Id: I8c0917836a24b303246a01c063bb2022d243db4b
Treehugger Robot [Tue, 1 Dec 2020 01:06:01 +0000 (01:06 +0000)]
Merge changes I23c831a6,I6a637b5e,I5a52498a,I69d5dff4,Ieb002c78 am:
e53c3a7a12 am:
df6c250a2c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512835
Change-Id: I8968000c344c05815983f741b7c537f19ed10501
Hansong Zhang [Tue, 1 Dec 2020 01:05:54 +0000 (01:05 +0000)]
ACL: Fix on_connection_packet_type_changed am:
341f9ff336 am:
516dabe9b1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1513258
Change-Id: Ifcf920910893a93eec385c1a3d401ce920ad3ebe
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 21:39:47 +0000 (21:39 +0000)]
L2cap classic shim: Use new helper am:
b17f980658 am:
ae9f091a59
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1507716
Change-Id: I153f10eec66914a750b4d434b55be87a994cdbf7
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
Treehugger Robot [Mon, 30 Nov 2020 20:08:45 +0000 (20:08 +0000)]
Merge "RootCanal: Use PIN pairing if no SSP" am:
8fb394e545 am:
2cc517ab5c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1511152
Change-Id: I9d36a0c57c62823647bcd0bde8a4b143bd62f257
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:35:07 +0000 (05:35 +0000)]
[automerger skipped] Merge "Migrate bluetooth imports to proto_logging" am:
99bd08fc96 am:
21b0626c52 -s ours
am skip reason: Change-Id I034d91894564010862b3bd0a4035e3e532a814b1 with SHA-1
cd71af71b9 is in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1508752
Change-Id: Ie2e970907a7cdf16f979128bfbe6b8a51634bf88
Chienyuan [Thu, 26 Nov 2020 05:34:49 +0000 (05:34 +0000)]
gd HCI: Do not reset alarm when unregister_client am:
a509f04a6e am:
6a5e4d51c3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1511088
Change-Id: Id7cc177d9ad3b0a4c3e9b3ac249dc07913df69c7
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
Jeffrey Huang [Wed, 25 Nov 2020 20:42:33 +0000 (20:42 +0000)]
Merge "Migrate bluetooth imports to proto_logging" into rvc-qpr-dev-plus-aosp
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 23:08:47 +0000 (23:08 +0000)]
Merge "gd: implement APIs of Advertising for Legacy" am:
91b0f3955f am:
fea97121c7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1509729
Change-Id: Idc4c33c7864f6aba990acbad9d77069964a7e5ed
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
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.
Ignore-AOSP-First: Requires other internal build rule changes. This
change will be cherry-picked to aosp afterwards.
Bug:
167962588
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I034d91894564010862b3bd0a4035e3e532a814b1
Merged-In: I034d91894564010862b3bd0a4035e3e532a814b1
Hansong Zhang [Tue, 24 Nov 2020 19:24:49 +0000 (19:24 +0000)]
L2cap shim: Remove unused API am:
d2aea9cd89 am:
ca1f081a7d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1506629
Change-Id: If4562de8f83bab2cb87c8eb3a7dcb54268bd41ed
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 18:16:55 +0000 (18:16 +0000)]
Merge changes I560edb20,Id8f90a59,If35e7bfc am:
910340ddc5 am:
d760768649
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1506276
Change-Id: I3de4409c678218f453a1190e24d49255e8b7f765
Treehugger Robot [Tue, 24 Nov 2020 18:16:42 +0000 (18:16 +0000)]
Merge changes Iac8f6a8e,I85f0dac1 am:
84a0fcd56d am:
b97abef37e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1500988
Change-Id: Ie1ce5f98689c44ca0f4a75c878fdda56c34cc59f
Treehugger Robot [Tue, 24 Nov 2020 18:16:33 +0000 (18:16 +0000)]
Merge changes I738f2a13,Id0f99289,Iefd5b0c7,I61013efd,I6f8b8ae8, ... am:
75e431f37c am:
a393ed37db
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1509220
Change-Id: Ibaeb81af35d2cdf2ad176cca7beeccd344400a71
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
OSDN Git Service
