OSDN Git Service
Treehugger Robot [Thu, 3 Dec 2020 03:40:26 +0000 (03:40 +0000)]
Merge changes from topic "gd_pin_code" am:
59db3648f0 am:
15cc953c03
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515147
Change-Id: Ie497e637d61766de01a4c740c032573efbb21f06
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
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
Hansong Zhang [Thu, 3 Dec 2020 01:10:00 +0000 (01:10 +0000)]
L2cap shim: clean up namespace am:
29b98651d9 am:
e4106782cc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515065
Change-Id: I3b6697d05308bbbba4a1ae4791f5db546e1b7edf
Treehugger Robot [Thu, 3 Dec 2020 00:44:29 +0000 (00:44 +0000)]
Merge changes Icf1a6f56,I1dad4b78,I2ac68e30,Ic7083219 am:
1c26f40b66 am:
1a78d405a3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1513339
Change-Id: I80e9c6d3b6cea309a6a92d925c1fabd697176960
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
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
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
Treehugger Robot [Thu, 3 Dec 2020 00:31:31 +0000 (00:31 +0000)]
Merge "Bluetooth: AsyncFdWatcher: Fix FD leak" am:
5b7ad83d30 am:
36dad1341d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515717
Change-Id: I5f023d8e2e3b5cc688a5d92422a820e9b47410a4
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
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
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
Treehugger Robot [Wed, 2 Dec 2020 22:50:02 +0000 (22:50 +0000)]
Merge "Bluetooth: AsyncFdWatcher: Fix FD leak"
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
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
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
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
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
Treehugger Robot [Wed, 2 Dec 2020 11:53:39 +0000 (11:53 +0000)]
Merge changes I4a4d6ba5,I719fad7c am:
3b327a173c am:
72884dd465
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512844
Change-Id: I7c3a6f693ef8e93af599f12989d21aa8aa7847a2
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
Treehugger Robot [Wed, 2 Dec 2020 10:35:16 +0000 (10:35 +0000)]
Merge changes I4a4d6ba5,I719fad7c
* changes:
Add btm control block btm_cb Init/Free()
Re-order btm_cb init/free sequence
Jakub Pawlowski [Wed, 2 Dec 2020 08:57:33 +0000 (08:57 +0000)]
Merge "Add Bluetooth LE Audio Profile (2/3)" am:
80ffd59ce2 am:
b2c0e7be81
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1511274
Change-Id: Icd76137c223fb3b9c1d70e818f27f8346b62e544
Treehugger Robot [Wed, 2 Dec 2020 08:57:19 +0000 (08:57 +0000)]
Merge "gd: Implement LE read advertising physical channel tx power" am:
0ee42d98d3 am:
d977c14cc8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512710
Change-Id: Ib9b8aedf6b0eba71ca0eeb2080d8ac87b2bc1b32
Jakub Pawlowski [Wed, 2 Dec 2020 08:22:01 +0000 (08:22 +0000)]
Merge "Add Bluetooth LE Audio Profile (2/3)" am:
80ffd59ce2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1511274
Change-Id: Ib8a719b86b4d91a89f784c4a3cef8dfc3cb3bfc9
Treehugger Robot [Wed, 2 Dec 2020 08:21:33 +0000 (08:21 +0000)]
Merge "gd: Implement LE read advertising physical channel tx power" am:
0ee42d98d3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512710
Change-Id: I2acd94536d3e96556ae622cc59637d1d7bfafb1d
Jakub Pawlowski [Wed, 2 Dec 2020 08:14:59 +0000 (08:14 +0000)]
Merge "Add Bluetooth LE Audio Profile (2/3)"
Treehugger Robot [Wed, 2 Dec 2020 07:26:07 +0000 (07:26 +0000)]
Merge "gd: Implement LE read advertising physical channel tx power"
Peng Qi [Tue, 22 Aug 2017 09:38:34 +0000 (17:38 +0800)]
Bluetooth: AsyncFdWatcher: Fix FD leak
AsyncFdWatcher thread notification pipe fds without close
which causes FD leak under Bluetooth on/off stress test.
Close the notification pipe fds when shut down Bluetooth.
Bug:
174630553
Test: Bluetooth on/off stress test
Change-Id: I7575adec49161f9764f0e070ef3c1043b8295a97
(cherry picked from commit
5c6da2669cea95d775b4a1ab0ddcdad4cac82671)
Chris Manton [Wed, 25 Nov 2020 19:39:44 +0000 (11:39 -0800)]
Add btm control block btm_cb Init/Free()
Towards life cycle aware code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: I4a4d6ba5fddb2e6d8af89f6b17fdeaa7816dcc86
Chris Manton [Sun, 29 Nov 2020 17:14:32 +0000 (09:14 -0800)]
Re-order btm_cb init/free sequence
Test: gd/cert/run --host
Bug:
163134718
Tag: #refactor
Change-Id: I719fad7c0d5c5d3b4f2c90b0540659f351786346
Hansong Zhang [Wed, 2 Dec 2020 05:34:21 +0000 (05:34 +0000)]
Simplify code in shim/l2c_api.cc am:
6e021b316f am:
29535fc1ec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515064
Change-Id: I65dd1b9f053298b18a4c2cb0ff10b54ff96bb704
Hansong Zhang [Wed, 2 Dec 2020 05:33:47 +0000 (05:33 +0000)]
gd/shim/l2cap is unused am:
725f7fa994 am:
4cf8bf89cd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1510512
Change-Id: I5b9f60b57bc0949fbbefb5618c1a002b34c079f3
Hansong Zhang [Wed, 2 Dec 2020 05:10:42 +0000 (05:10 +0000)]
Simplify code in shim/l2c_api.cc am:
6e021b316f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1515064
Change-Id: I08899604e126128847e76593ee101f8b1712aa93
Hansong Zhang [Wed, 2 Dec 2020 05:09:58 +0000 (05:09 +0000)]
gd/shim/l2cap is unused am:
725f7fa994
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1510512
Change-Id: I839a60493697b9ac0aa840c4accd5db38c6c2c6d
Hansong Zhang [Mon, 30 Nov 2020 23:36:44 +0000 (15:36 -0800)]
Simplify code in shim/l2c_api.cc
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: Iae00fbea2dba97485047793d5355c3072258d28f
Hansong Zhang [Tue, 24 Nov 2020 21:44:49 +0000 (13:44 -0800)]
gd/shim/l2cap is unused
Use main/shim/l2c_api.cc instead.
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: Iedb42433c0aad4fe5c558d7252e0d78160dbab16
Chris Manton [Wed, 2 Dec 2020 04:13:47 +0000 (04:13 +0000)]
Add privatize option for bluetooth addresses for logging am:
bdc0872019 am:
a68f4b4ec4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512436
Change-Id: Ie942cdf3688d08ae26d750632a3525a1782691f5
Chris Manton [Wed, 2 Dec 2020 03:43:48 +0000 (03:43 +0000)]
Add privatize option for bluetooth addresses for logging am:
bdc0872019
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1512436
Change-Id: I835c98535627b51cc87354c18e3fca354eaa4570
Chienyuan [Wed, 2 Dec 2020 03:05:30 +0000 (11:05 +0800)]
gd: Implement LE read advertising physical channel tx power
Tag: #gd-refactor
Bug:
169125803
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: Ida1ac156048c68247bd91ba929a1b70e6f26c6e9
Treehugger Robot [Wed, 2 Dec 2020 02:22:33 +0000 (02:22 +0000)]
Merge "gd: Add local/remote acl connection initiator bit" am:
73a1feb32b am:
7e60f293b3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1513341
Change-Id: Ia247f9406017f170e6153d0ab6f3ccddd9862f2c
Treehugger Robot [Wed, 2 Dec 2020 02:22:12 +0000 (02:22 +0000)]
Merge changes Id056390a,I2997aab5 am:
2de3418ec9 am:
50abcdb2fe
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1513753
Change-Id: I8f85e7781e599ac73c23f7064eca52a58358aab7
Treehugger Robot [Wed, 2 Dec 2020 01:47:33 +0000 (01:47 +0000)]
Merge "gd: Add local/remote acl connection initiator bit" am:
73a1feb32b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1513341
Change-Id: Ie3c9098e89caed3c593583cde39c8fa66603c0d4
Treehugger Robot [Wed, 2 Dec 2020 01:45:38 +0000 (01:45 +0000)]
Merge changes Id056390a,I2997aab5 am:
2de3418ec9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1513753
Change-Id: If9c787cd4a6d91d6e389fd1e52aa81068ea3d34e
Chris Manton [Mon, 30 Nov 2020 01:05:05 +0000 (17:05 -0800)]
Add privatize option for bluetooth addresses for logging
Toward loggable code
Bug:
163134718
Tag: #refactor
Test: gd/cert/run --host
Change-Id: Id568adb9f9497072a79100202501c4d207e40828
Treehugger Robot [Wed, 2 Dec 2020 00:19:27 +0000 (00:19 +0000)]
Merge "gd: Add local/remote acl connection initiator bit"
Treehugger Robot [Tue, 1 Dec 2020 23:18:21 +0000 (23:18 +0000)]
Merge changes Id056390a,I2997aab5
* changes:
gd: Fix flaky tests of LeAdvertisingManager
LeAddressManagerTest: Set InitFlags for testing
Hansong Zhang [Tue, 1 Dec 2020 22:44:24 +0000 (22:44 +0000)]
Remove unused shim/l2cap.h and shim/l2cap.cc am:
41a1fec066 am:
54a1e784f4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1510511
Change-Id: I4f88ed31a5bf977b086437d9d60135ce49b031bd
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:31:04 +0000 (22:31 +0000)]
Remove unused shim/l2cap.h and shim/l2cap.cc am:
41a1fec066
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1510511
Change-Id: I8675e339cbddd793930252e35dc90be72bd27b62
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
Chris Manton [Wed, 25 Nov 2020 02:38:01 +0000 (18:38 -0800)]
gd: Add local/remote acl connection initiator bit
Report the initiator of the acl connection.
Bug:
166280067
Test: gd/cert/run --host
Tag: #refactor
Change-Id: If123478fd271f9f49ff9a3d0e30be8a9a6e1abfd
Hansong Zhang [Tue, 24 Nov 2020 21:19:09 +0000 (13:19 -0800)]
Remove unused shim/l2cap.h and shim/l2cap.cc
Migrated to shim/l2c_api.cc
Tag: #gd-refactor
Bug:
141555841
Test: cert/run --host
Change-Id: I1878312705cb7cb10d76cba35acbe81b7e0f8c15
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
Chienyuan [Tue, 1 Dec 2020 08:57:47 +0000 (16:57 +0800)]
gd: Fix flaky tests of LeAdvertisingManager
Bug:
174541433
Tag: #gd-refactor
Test: atest bluetooth_test_gd
Change-Id: Id056390a28e5b60d47a43ab0eaeacf44edb451fd
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