OSDN Git Service
Abhishek Pandit-Subedi [Tue, 11 May 2021 21:44:39 +0000 (21:44 +0000)]
Fix incorrect enum comparison of LE close reason am:
d9709f256a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1703785
Change-Id: Ibb2d71d0c78b3764478d8dfa1870a92295cd4a45
Treehugger Robot [Tue, 11 May 2021 20:32:16 +0000 (20:32 +0000)]
Merge "Print errors if acceptlist events are too small" am:
c607a04361
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1702425
Change-Id: I637e7763d68496ea0af60aa7aa952931dec74ed1
Abhishek Pandit-Subedi [Tue, 11 May 2021 17:20:36 +0000 (17:20 +0000)]
Fix incorrect enum comparison of LE close reason
The LE close reason is tGATT_DISCONN_REASON but it's compared against
tHCI_ERROR_CODE. Besides just being different types, they are also
backed by different primitives (u16 for gatt vs u8 for hci). This fails
in stricter build environments (i.e. ChromeOS).
Bug:
187836537
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I0f926b6fad9f20adde5e1e7ff89bcc7c8da01f93
Treehugger Robot [Tue, 11 May 2021 20:03:13 +0000 (20:03 +0000)]
Merge "Print errors if acceptlist events are too small"
Abhishek Pandit-Subedi [Tue, 11 May 2021 19:15:07 +0000 (19:15 +0000)]
Add missing dependency on proto_logging am:
1a7b868996
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1703505
Change-Id: I9c5345c55c431a9adb8ed2109ce65d23d90c8f2a
Abhishek Pandit-Subedi [Tue, 11 May 2021 16:18:52 +0000 (16:18 +0000)]
Add missing dependency on proto_logging
Bug:
187827282
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: If79f77e926c1f57f9389d4de7e2a6ad537a2b572
Chris Manton [Tue, 11 May 2021 07:42:04 +0000 (07:42 +0000)]
Introduce stack_gatt_test am:
ab6a940be3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698932
Change-Id: I2be242b4c3f834dbcdd79d40af95f723c0391dca
Chris Manton [Tue, 11 May 2021 07:42:01 +0000 (07:42 +0000)]
Add crypto toolbox mocks am:
8673f2d243
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698931
Change-Id: I9deb75f5fff7d01febece25992f53ad215b59c9f
Chris Manton [Tue, 11 May 2021 07:40:10 +0000 (07:40 +0000)]
Point stack_btm_test to use common test/mocks am:
27c8011064
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698145
Change-Id: I7db19c9472837f950b41fe019546a6d73b3e004c
Myles Watson [Tue, 11 May 2021 00:11:55 +0000 (17:11 -0700)]
Print errors if acceptlist events are too small
Bug:
173985410
Tag: #refactor
Test: gd/cert/run
Change-Id: I035d5de3570d22e3b114e5d18fb9065b82a9cf26
Chris Manton [Mon, 10 May 2021 01:26:28 +0000 (01:26 +0000)]
Enum-ify stack/gatt::tGATTC_OPTYPE am:
738aa4df92
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1700124
Change-Id: Ica7315e33a0f9725104cad42b98e1936c977ae4d
Chris Manton [Mon, 10 May 2021 01:26:26 +0000 (01:26 +0000)]
Append mock_stack_acl::acl_add_to_ignore_auto_connect_after_disconnect am:
b574284da4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698943
Change-Id: I047955d237d12f2e0cc68369b8757011aed4776e
Chris Manton [Mon, 10 May 2021 01:26:23 +0000 (01:26 +0000)]
Add test/mock/mock_stack_btm_ble_bgconn am:
2fbdb96b10
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698942
Change-Id: I8c716efd57a6a648c8b83d2954ba33dea8a80cbe
Chris Manton [Mon, 10 May 2021 01:26:21 +0000 (01:26 +0000)]
Remove useless #def BTA_GATTC_MULTI_MAX am:
546049a5c2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698159
Change-Id: I5441f153953f23e3ba90a188d1db7412d2299e07
Chris Manton [Mon, 10 May 2021 01:25:18 +0000 (01:25 +0000)]
Remove unused tBTA_GATT_REASON am:
c30d36bf0f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698154
Change-Id: I0b7733f596a13b77f5638ad298e2e552f24b35bf
Chris Manton [Sun, 9 May 2021 21:03:57 +0000 (21:03 +0000)]
Stat-ify various bta/gatt/bta_gattc_act am:
2e9d317b2a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1700405
Change-Id: Ifd9c914633d93c6750190d02710d5237fac53ac6
Chris Manton [Sun, 9 May 2021 21:02:31 +0000 (21:02 +0000)]
Conform btm_status_text to CASE_RETURN_TEXT convention am:
37f645f6f3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698156
Change-Id: Icdf9f9451d43882deb2a7562c943d50551660b45
Chris Manton [Fri, 7 May 2021 00:35:37 +0000 (17:35 -0700)]
Introduce stack_gatt_test
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: I61ebf28260bdda015e8e826bd3fb9d91cef747ea
Chris Manton [Thu, 6 May 2021 20:10:00 +0000 (13:10 -0700)]
Add crypto toolbox mocks
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I26f89aeede8af8e182a591d9e99072012d58abe1
Chris Manton [Wed, 5 May 2021 23:58:48 +0000 (16:58 -0700)]
Point stack_btm_test to use common test/mocks
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: I40c663f53914e6174ae531648c027b9cd0f7ab56
Chris Manton [Fri, 7 May 2021 15:54:45 +0000 (08:54 -0700)]
Enum-ify stack/gatt::tGATTC_OPTYPE
Towards readable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: Ib44fdf887a41bdf7bbc3e8a7496b8c59800f7e19
Chris Manton [Fri, 7 May 2021 00:34:24 +0000 (17:34 -0700)]
Append mock_stack_acl::acl_add_to_ignore_auto_connect_after_disconnect
Towards testable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I70a2e593bcf0264f1ef5f0a1a25c8f85aa70164c
Chris Manton [Fri, 7 May 2021 00:34:08 +0000 (17:34 -0700)]
Add test/mock/mock_stack_btm_ble_bgconn
Toward testable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: Iff48a9c0df0b3adc7d9ccfb40b5f996cfb27748e
Chris Manton [Sun, 9 May 2021 16:32:10 +0000 (16:32 +0000)]
Use proper types bta/hh//::BTM_STATUS am:
e20ffdad66
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698944
Change-Id: I1f43e265be39c395be31cef024c2f5bf7a08ae67
Chris Manton [Wed, 5 May 2021 21:21:00 +0000 (14:21 -0700)]
Remove useless #def BTA_GATTC_MULTI_MAX
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: I27200f714209ab74b84b5140562f0f795176f8bc
Chris Manton [Wed, 5 May 2021 21:15:00 +0000 (14:15 -0700)]
Remove unused tBTA_GATT_REASON
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: I601d4bcb8d382172b34cfa88a4ba49669cf648af
Chris Manton [Fri, 7 May 2021 16:45:26 +0000 (09:45 -0700)]
Stat-ify various bta/gatt/bta_gattc_act
Towards encapsulated code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I25bf9688960f474d23766e66a80442df71f79f76
Chris Manton [Sun, 2 May 2021 18:16:30 +0000 (11:16 -0700)]
Conform btm_status_text to CASE_RETURN_TEXT convention
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: I59fa269b23510ee7866d7fea7771442a3ad562f3
Chris Manton [Sun, 9 May 2021 06:30:57 +0000 (06:30 +0000)]
Combine decl/defs bta/hh/bta_hh_le::bta_hh_gatt_close am:
4c4f9b58d4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1699605
Change-Id: Id34fe5ff8a81cf93664e1130cc167d70c5bf8aa7
Chris Manton [Fri, 7 May 2021 01:36:56 +0000 (18:36 -0700)]
Use proper types bta/hh//::BTM_STATUS
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: If5f26ebb381688c153cec41dc8fecb2cd150b35a
Chris Manton [Sun, 9 May 2021 04:52:52 +0000 (04:52 +0000)]
Remove unnecessary layer of obfuscation tBTA_GATTC_CMPL am:
af1c561f87
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1700123
Change-Id: I22f53cbb20ed6f3f4a82b47b6dfaf7c79f00854e
Chris Manton [Fri, 7 May 2021 01:37:28 +0000 (18:37 -0700)]
Combine decl/defs bta/hh/bta_hh_le::bta_hh_gatt_close
Towards readable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I4bb2f4480d97ff59a000c94489837315b852c0e5
Chris Manton [Sun, 9 May 2021 03:11:38 +0000 (03:11 +0000)]
Straighten out tBTA_GATT_REASON am:
df50228be2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698153
Change-Id: I0e8a127483f2325ed8ebf6d03629b141a59e0140
Chris Manton [Fri, 7 May 2021 21:16:29 +0000 (14:16 -0700)]
Remove unnecessary layer of obfuscation tBTA_GATTC_CMPL
Towards searchable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: Ic02dc13c47ea19c19161326e519a2e904d927f91
Chris Manton [Sun, 9 May 2021 01:24:42 +0000 (01:24 +0000)]
Add bta/hh/bta_hh_utils::bta_hh_get_cb am:
81f456dbd5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698930
Change-Id: Iac6d2989a9bcb4bfa831162b3f9780057838b2d3
Chris Manton [Sun, 2 May 2021 16:52:25 +0000 (09:52 -0700)]
Straighten out tBTA_GATT_REASON
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: Ib66bbdbc753480bc6a69136b3bbe1d08e11730b3
Chris Manton [Thu, 6 May 2021 01:36:44 +0000 (18:36 -0700)]
Add bta/hh/bta_hh_utils::bta_hh_get_cb
I don't care about your indicies
Bug:
182370398
Test: gd/cert/run
Tag: #refactor
Change-Id: Ib41e4e5d4caca8f2b628d46064290c391fb48fc5
Treehugger Robot [Sat, 8 May 2021 22:09:13 +0000 (22:09 +0000)]
Merge "Konstify kBTA_HH_LE_RECONN conditional" am:
2794735921
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698152
Change-Id: I74da5b40cf2c6d796a1994159d231f68651d2c55
Treehugger Robot [Sat, 8 May 2021 22:00:39 +0000 (22:00 +0000)]
Merge "DO NOT MERGE - Merge RQ2A.210505.003." am:
c2a57d7301
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1700410
Change-Id: Ia3d7cf9a4216bd638ab851b90e0ded25d8e39781
Xin Li [Sat, 8 May 2021 22:00:36 +0000 (22:00 +0000)]
DO NOT MERGE - Merge RQ2A.210505.003. am:
ebdfbedbe0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1700410
Change-Id: I41c9b5baffc1870a41cbae791c2d59c1e55031df
Treehugger Robot [Sat, 8 May 2021 21:44:04 +0000 (21:44 +0000)]
Merge "Konstify kBTA_HH_LE_RECONN conditional"
Treehugger Robot [Sat, 8 May 2021 21:38:01 +0000 (21:38 +0000)]
Merge "DO NOT MERGE - Merge RQ2A.210505.003."
Treehugger Robot [Sat, 8 May 2021 20:36:15 +0000 (20:36 +0000)]
Merge "Remove bta_hh_is_le_device check" am:
935e5325b1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698149
Change-Id: Ib60c5205fb32b99c6f931ffc9deb2834b8a16d16
Chris Manton [Sun, 2 May 2021 18:46:32 +0000 (11:46 -0700)]
Konstify kBTA_HH_LE_RECONN conditional
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: I415297d3be0509e835406a0d06b9bd2a85300252
Treehugger Robot [Sat, 8 May 2021 20:25:37 +0000 (20:25 +0000)]
Merge "Remove bta_hh_is_le_device check"
Treehugger Robot [Sat, 8 May 2021 17:51:50 +0000 (17:51 +0000)]
Merge "A2DP: Clear remote suspend flag if local is also stopping" am:
54154222cd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690585
Change-Id: I6a59eaba6cbb2f2e5eb34eaf1c0d1f801ee72a46
Treehugger Robot [Sat, 8 May 2021 17:34:29 +0000 (17:34 +0000)]
Merge "A2DP: Clear remote suspend flag if local is also stopping"
Chris Manton [Fri, 30 Apr 2021 20:00:54 +0000 (13:00 -0700)]
Remove bta_hh_is_le_device check
Directly access BTM for le information and set state
accordingly.
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: Ifca04d19bcd1a1892a7356bb3436923d77ba1350
Xin Li [Sat, 8 May 2021 01:55:14 +0000 (18:55 -0700)]
DO NOT MERGE - Merge RQ2A.210505.003.
Bug:
187544653
Merged-In: I592c0a9c0e77869999357611aa99f3d9bc53b8b6
Change-Id: I9b78552543c66bb607baee982d904e8939941cea
Treehugger Robot [Fri, 7 May 2021 23:11:37 +0000 (23:11 +0000)]
Merge "Add default rustfmt.toml" am:
7acda66f83
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1696170
Change-Id: I38a922fc28631dc10f1135db383129a6bbb74315
Treehugger Robot [Fri, 7 May 2021 22:41:49 +0000 (22:41 +0000)]
Merge "Add default rustfmt.toml"
Chienyuan [Fri, 7 May 2021 21:56:25 +0000 (21:56 +0000)]
gd: Implement timeout callback for direct le connection am:
6fd78a704e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698250
Change-Id: I9139641c3c5636fe707db452653f21f8130a90db
Chienyuan [Thu, 6 May 2021 15:11:23 +0000 (23:11 +0800)]
gd: Implement timeout callback for direct le connection
Tag: #gd-refactor
Bug:
183575877
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I34a01421839ce4d59557cd8b6bd8bf410cca6158
Hansong Zhang [Tue, 4 May 2021 20:09:49 +0000 (20:09 +0000)]
Add default rustfmt.toml
Test: run rustfmt
Change-Id: I69b10b53cf339ea3d2769b1a524a82b777a0770d
Treehugger Robot [Fri, 7 May 2021 03:00:54 +0000 (03:00 +0000)]
Merge "gd: Add parameter for background connection" am:
e63550100b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1697086
Change-Id: I8b575718cecf8ff2fd29d033353ac809473823cc
Treehugger Robot [Fri, 7 May 2021 02:09:22 +0000 (02:09 +0000)]
Merge "gd: Add parameter for background connection"
Chris Manton [Fri, 7 May 2021 02:00:19 +0000 (02:00 +0000)]
Re-log bta/hh/bta_hh_main::bta_hh_sm_execute am:
60cbde08a6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698150
Change-Id: I37acec7e14bed8fecaad8d6d91ea89fadd1478e3
Treehugger Robot [Fri, 7 May 2021 01:59:00 +0000 (01:59 +0000)]
Merge changes I7cc676cb,Ib2a58823,I2795f034,I5bb782f3,I6311bd6d, ... am:
308510f19d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698148
Change-Id: I613ddfda3a826a1217dab5538991b80e6ce36ffa
Chris Manton [Sat, 1 May 2021 06:39:23 +0000 (23:39 -0700)]
Re-log bta/hh/bta_hh_main::bta_hh_sm_execute
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: I42741e09f45c98bb898fe874b13783c4bdb9162c
Treehugger Robot [Fri, 7 May 2021 01:07:58 +0000 (01:07 +0000)]
Merge changes I7cc676cb,Ib2a58823,I2795f034,I5bb782f3,I6311bd6d, ...
* changes:
Add polling thread pid to hid control block
Streamline stack/acl/btm_acl::BTM_SetLinkSuperTout
Canonically include crypto in stack/gatt/gatt_sr_hash
Canonically include stack/gatt::
Include gd/hal/hci_hal_host::<netinet/in.h>
Remove useless #def BTM_LE_BR_KEYS_REQ_EVT
Chris Manton [Wed, 5 May 2021 21:15:12 +0000 (14:15 -0700)]
Add polling thread pid to hid control block
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: I7cc676cb9af62d9aac1297e44b4bc590aa3380f6
Hansong Zhang [Thu, 6 May 2021 23:08:24 +0000 (23:08 +0000)]
AsyncFd: clear_ready() before drop() am:
7258dad0d6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698065
Change-Id: I1cecacbda21bfe9640ab6b7f82b18f9378966fae
Chris Manton [Thu, 29 Apr 2021 05:23:47 +0000 (22:23 -0700)]
Streamline stack/acl/btm_acl::BTM_SetLinkSuperTout
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: Ib2a588236e98317ef14b619d6416379e7ff35e4c
Chris Manton [Thu, 6 May 2021 19:50:49 +0000 (12:50 -0700)]
Canonically include crypto in stack/gatt/gatt_sr_hash
There are 2 cryptos in this project
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I2795f034d1d06d8e65645c22aec6dcaff2f5885e
Chris Manton [Thu, 6 May 2021 19:10:11 +0000 (12:10 -0700)]
Canonically include stack/gatt::
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: I5bb782f3d019535cd53129cfe450bb233c912975
Hansong Zhang [Wed, 5 May 2021 23:11:39 +0000 (23:11 +0000)]
AsyncFd: clear_ready() before drop()
Otherwise select! won't continue to work.
Also we need rt-multi-thread for tokio::runtime::Runtime::new
Test: cargo test
Change-Id: I2b7cbf8bd93622f404f10b55df443daf5c1a19f2
Chienyuan [Wed, 5 May 2021 08:09:47 +0000 (16:09 +0800)]
gd: Add parameter for background connection
Tag: #gd-refactor
Bug:
183575877
Bug:
185286437
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I070ccd94d600c6c0da4a996cd2b1fa03820bbf32
Treehugger Robot [Thu, 6 May 2021 06:36:32 +0000 (06:36 +0000)]
Merge "gd: Handle LE advertisement tracking sub-event" am:
db191f3db3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1693508
Change-Id: I025ce7f71a2b8fa3a4a92d03a2d9a1b3bf2af9b3
Treehugger Robot [Thu, 6 May 2021 06:19:21 +0000 (06:19 +0000)]
Merge "gd: Handle LE advertisement tracking sub-event"
Chris Manton [Thu, 6 May 2021 00:28:17 +0000 (17:28 -0700)]
Include gd/hal/hci_hal_host::<netinet/in.h>
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I6311bd6d28f8df1d8786fb35ef7ba014f5aa8e8e
Chris Manton [Wed, 5 May 2021 20:08:23 +0000 (13:08 -0700)]
Remove useless #def BTM_LE_BR_KEYS_REQ_EVT
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: Ifff03af11a65653e739785a4432157392d01817e
Chienyuan [Thu, 6 May 2021 03:31:06 +0000 (03:31 +0000)]
gd: Check stack is running before getting storage am:
fa8926ba7b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1697085
Change-Id: I74ce30229decfa32272ea980039a26d5719fac00
Chienyuan [Wed, 5 May 2021 07:51:49 +0000 (15:51 +0800)]
gd: Check stack is running before getting storage
Tag: #gd-refactor
Bug:
186696547
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I9d545f4c9cadbf981ded9ddaf5138a229cc384e3
Chris Manton [Tue, 4 May 2021 23:59:03 +0000 (23:59 +0000)]
Merge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5 am:
a69349e3ad
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1695079
Change-Id: I002252b6ddbf8e17bdfba8133950fb20cbccd0c9
Chris Manton [Tue, 4 May 2021 23:31:54 +0000 (23:31 +0000)]
Merge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5
* changes:
Use gatt_client_event_text convention for logging
shim: Add l2cap per-channel network transfer metrics
shim: Add hid profile to dumpsys
Add stack/gatt::gatt_channel_state_text
Add stack/gatt::gatt_security_action_text
Myles Watson [Tue, 4 May 2021 22:32:13 +0000 (22:32 +0000)]
Merge "Parse scan_data_resp of advertisement tracking event correctly" am:
08f674c623
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1695545
Change-Id: I8f6f90b0b6d420e1fa14584f48e3579735b0817d
Myles Watson [Tue, 4 May 2021 22:15:41 +0000 (22:15 +0000)]
Merge "Parse scan_data_resp of advertisement tracking event correctly"
Sonny Sasaka [Tue, 4 May 2021 21:46:03 +0000 (21:46 +0000)]
Merge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f am:
0a9ce6af0e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687554
Change-Id: If39b2bc754d21b1d4dc1ac258a36cb4a0c21cac8
Sonny Sasaka [Tue, 4 May 2021 21:22:50 +0000 (21:22 +0000)]
Merge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f
* changes:
Add D-Bus daemon binary
Add `dbus_projection` crate
Add the `btstack` crate
Add topshim for bluetooth interface
Chris Manton [Fri, 30 Apr 2021 20:09:28 +0000 (13:09 -0700)]
Use gatt_client_event_text convention for logging
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Ib557fbeaefb4231ef911cbd3aa1f4f5b33000c69
Chris Manton [Fri, 30 Apr 2021 17:23:27 +0000 (10:23 -0700)]
shim: Add l2cap per-channel network transfer metrics
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I25bb743c6f9052b93a1bb8c663033c22e2bd16a8
Chris Manton [Fri, 30 Apr 2021 00:27:38 +0000 (17:27 -0700)]
shim: Add hid profile to dumpsys
Bug:
183374320
Test: gd/cert/run
Tag: #refactor
Change-Id: I99f2584c52f1718f35b7b20abf713b0dfef1bd81
Chris Manton [Tue, 4 May 2021 01:16:55 +0000 (18:16 -0700)]
Add stack/gatt::gatt_channel_state_text
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I852e94277db93c1773b30d4ad91e1ac166270611
Chris Manton [Mon, 3 May 2021 16:04:06 +0000 (09:04 -0700)]
Add stack/gatt::gatt_security_action_text
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: Iecae9ca52a8660151de1ea4c4402f75a3790f43f
Martin Brabham [Tue, 4 May 2021 20:04:06 +0000 (20:04 +0000)]
Merge "OOB: Add public address to OOB data" am:
6107593afb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692382
Change-Id: Ia69a0bc0243922084841fba93b28dd1a880bdacf
Sonny Sasaka [Tue, 4 May 2021 20:03:59 +0000 (20:03 +0000)]
Merge "Add rust binaries to link with C++ staticlib" am:
0ccbc22083
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1686947
Change-Id: I2cb621a688d3c1ecf8af5f6e63afcb2298ae1cb6
Sonny Sasaka [Tue, 4 May 2021 20:02:33 +0000 (20:02 +0000)]
Merge "Add TARGET_FLOSS define" am:
86cbc1a913
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1686946
Change-Id: I32e4fd29375810d67c0750bb4011819807e2f478
Martin Brabham [Tue, 4 May 2021 19:52:42 +0000 (19:52 +0000)]
Merge "OOB: Add public address to OOB data"
Sonny Sasaka [Tue, 27 Apr 2021 08:36:14 +0000 (01:36 -0700)]
Add D-Bus daemon binary
The D-Bus daemon connects the RPC-agnostic API implementations in
`btstack` crate with the `dbus_projection` to make a D-Bus projection of
the API implementation.
Bug:
186492781
Tag: #floss
Test: manual - Use dbus-send util
Change-Id: I12391f4e9739a5d1ed6167990fc016429e7280d4
Sonny Sasaka [Tue, 27 Apr 2021 08:04:11 +0000 (01:04 -0700)]
Add `dbus_projection` crate
The crate provides tools to project Rust API to D-Bus. The API needs to
follow go/floss-api-principles.
Bug:
186492781
Tag: #floss
Test: manual - tested with D-Bus integration in the next patch
Change-Id: I3bdf0ea0b935c45b4fb727fb79d0705eaf6f7b3e
Sonny Sasaka [Tue, 27 Apr 2021 07:31:33 +0000 (00:31 -0700)]
Add the `btstack` crate
The `btstack` crate contains the floss API implementations independent
of any RPC projection. This patch adds the basic skeleton that
implements the first simplest methods.
Bug:
186492781
Tag: #floss
Test: manual - tested with D-Bus integration in the next patch
Change-Id: I10ff16d7e6cfcb599a3b356c58d7af15bcaa61d3
Sonny Sasaka [Tue, 4 May 2021 19:09:58 +0000 (19:09 +0000)]
Merge "Add rust binaries to link with C++ staticlib"
Sonny Sasaka [Tue, 4 May 2021 19:08:59 +0000 (19:08 +0000)]
Merge "Add TARGET_FLOSS define"
Chris Manton [Tue, 4 May 2021 16:42:55 +0000 (16:42 +0000)]
Enum-ify stack/gatt::tGATT_SEC_ACTION am:
9948dd3af7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1695074
Change-Id: Iab07e00714b787eb9cdb9d80181da18416f450e2
Chris Manton [Tue, 4 May 2021 16:42:53 +0000 (16:42 +0000)]
Remove unused field stack/avct/avct_int::ch_flags am:
ca87a30723
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1695073
Change-Id: I6b7d8ee3405cd16502c0539cf221c5599fe5cbc6
Chris Manton [Tue, 4 May 2021 16:42:08 +0000 (16:42 +0000)]
Re-log stack/include::gatt_disconnection_reason_text am:
3016a29448
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1695072
Change-Id: Ifb6c4c286b221d2f84489c83266be6e62010cc35
Chris Manton [Tue, 4 May 2021 14:47:44 +0000 (14:47 +0000)]
Merge changes I37e29f23,I512714db,If8acc10e am:
f22c4c97da
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1695071
Change-Id: Ie97ca6b2d76c50c03113b6f1ef9e639a4d523dc1
Chris Manton [Mon, 3 May 2021 06:13:02 +0000 (23:13 -0700)]
Enum-ify stack/gatt::tGATT_SEC_ACTION
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I57eb31e9e39f073380949dc9df4510a8adb81dfb
Chris Manton [Mon, 3 May 2021 16:04:32 +0000 (09:04 -0700)]
Remove unused field stack/avct/avct_int::ch_flags
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I9c969c5ce65094e6236166adcb281bc728602f79
Chris Manton [Mon, 3 May 2021 05:02:24 +0000 (22:02 -0700)]
Re-log stack/include::gatt_disconnection_reason_text
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I24b67cabd41737cddc431039289def92fd1f5e80