OSDN Git Service
Treehugger Robot [Wed, 12 May 2021 15:11:36 +0000 (15:11 +0000)]
Merge "gd: Implement vendor specific event manager" am:
6ef21313f3 am:
c06892163e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1695546
Change-Id: I4ef8edd8be1efb67110232debd4cfb0cfb4adb03
Treehugger Robot [Wed, 12 May 2021 14:41:28 +0000 (14:41 +0000)]
Merge "gd: Implement vendor specific event manager" am:
6ef21313f3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1695546
Change-Id: Ib5b2a63d7a199a94db6fd186767d2868cbc70bff
Treehugger Robot [Wed, 12 May 2021 13:31:10 +0000 (13:31 +0000)]
Merge "gd: Implement vendor specific event manager"
Chienyuan [Tue, 4 May 2021 13:54:04 +0000 (21:54 +0800)]
gd: Implement vendor specific event manager
Tag: #gd-refactor
Bug:
186234480
Test: gd/cert/run
Test: bluetooth_test_gd
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I62ce950d2944014d2e14f5b0a68933c499d4a4ac
Treehugger Robot [Tue, 11 May 2021 22:05:45 +0000 (22:05 +0000)]
Merge "gd: Prevent erroneous fail connection on acceptlist change" am:
aa48544e4a am:
a2cf5a102c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1702565
Change-Id: Ie76ec97bd9482ca83e139931c027c6fb16d08d21
Abhishek Pandit-Subedi [Tue, 11 May 2021 22:05:32 +0000 (22:05 +0000)]
Fix incorrect enum comparison of LE close reason am:
d9709f256a am:
b6f964e073
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1703785
Change-Id: Ia6b929c9825e41ef8fdd2768f1cc127375e70faf
Treehugger Robot [Tue, 11 May 2021 21:45:20 +0000 (21:45 +0000)]
Merge "gd: Prevent erroneous fail connection on acceptlist change" am:
aa48544e4a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1702565
Change-Id: Ie9b00ef4ebb75241416406c5176e8c5fa6c379d2
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 21:28:48 +0000 (21:28 +0000)]
Merge "gd: Prevent erroneous fail connection on acceptlist change"
Treehugger Robot [Tue, 11 May 2021 21:02:36 +0000 (21:02 +0000)]
Merge "Print errors if acceptlist events are too small" am:
c607a04361 am:
469f9f00f4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1702425
Change-Id: I253140b0ece83ee10d879c2b7f45f0ca2f79d8c3
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:47:33 +0000 (19:47 +0000)]
Add missing dependency on proto_logging am:
1a7b868996 am:
b71684906b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1703505
Change-Id: I16b00cec2e956cc75c6eaad536550a89cf58818f
Chris Manton [Tue, 11 May 2021 19:47:24 +0000 (19:47 +0000)]
Introduce stack_gatt_test am:
ab6a940be3 am:
fe49762695
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698932
Change-Id: Ib23cc261d6de5ee98b5c833272a71bc620d6762c
Chris Manton [Tue, 11 May 2021 19:47:23 +0000 (19:47 +0000)]
Add crypto toolbox mocks am:
8673f2d243 am:
c594d999a0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698931
Change-Id: I900595f9dc44bd95f27de5b319d4ffa8a7be4b6a
Chris Manton [Tue, 11 May 2021 19:46:30 +0000 (19:46 +0000)]
Point stack_btm_test to use common test/mocks am:
27c8011064 am:
df22462621
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698145
Change-Id: I87fd045219023e8c4037b61daa9a9da4f0112de0
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
Chris Manton [Mon, 10 May 2021 19:46:44 +0000 (12:46 -0700)]
gd: Prevent erroneous fail connection on acceptlist change
The packet fields are invalid for the conditioned logic.
Bug:
187736009
Test: gd/cert/run
Tag: #refactor
Change-Id: Ie4e4dcf1333c4f5f3a10635f6ed91380cb873f73
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:39:48 +0000 (01:39 +0000)]
Enum-ify stack/gatt::tGATTC_OPTYPE am:
738aa4df92 am:
787494b3b7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1700124
Change-Id: I954603c585909b09c991013f88bd8314fac30ca5
Chris Manton [Mon, 10 May 2021 01:39:48 +0000 (01:39 +0000)]
Append mock_stack_acl::acl_add_to_ignore_auto_connect_after_disconnect am:
b574284da4 am:
c79b69267a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698943
Change-Id: I7866ea4250f7258e3f762086e38834045565b4fa
Chris Manton [Mon, 10 May 2021 01:39:47 +0000 (01:39 +0000)]
Add test/mock/mock_stack_btm_ble_bgconn am:
2fbdb96b10 am:
43e7b73b91
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698942
Change-Id: Iecfb1f1f4617b2a3fcae517247408ac3eddd3beb
Chris Manton [Mon, 10 May 2021 01:39:46 +0000 (01:39 +0000)]
Remove useless #def BTA_GATTC_MULTI_MAX am:
546049a5c2 am:
67741ade3d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698159
Change-Id: I7019b14b3b11427c2746afaf243b2af8da4cd4f7
Chris Manton [Mon, 10 May 2021 01:39:44 +0000 (01:39 +0000)]
Remove unused tBTA_GATT_REASON am:
c30d36bf0f am:
255c36d28b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698154
Change-Id: I92530d76d6b400030460bd68e2a26f7b05d82c6f
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:49:40 +0000 (21:49 +0000)]
Stat-ify various bta/gatt/bta_gattc_act am:
2e9d317b2a am:
c4e0be25fc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1700405
Change-Id: I5db36988845698f95cee1701cecdb3ba1cbb6782
Chris Manton [Sun, 9 May 2021 21:49:38 +0000 (21:49 +0000)]
Conform btm_status_text to CASE_RETURN_TEXT convention am:
37f645f6f3 am:
fb99abcbd4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698156
Change-Id: I45bbef339e1702397a74091205cf1aa16c908c5f
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 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: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 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 17:11:16 +0000 (17:11 +0000)]
Use proper types bta/hh//::BTM_STATUS am:
e20ffdad66 am:
3fb2d1c977
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698944
Change-Id: I223219465b6abea53852f294d9822bff394b97a7
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:48:58 +0000 (06:48 +0000)]
Combine decl/defs bta/hh/bta_hh_le::bta_hh_gatt_close am:
4c4f9b58d4 am:
114a395d26
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1699605
Change-Id: Ifbdb94e81adb7ef1a0c6569a816adbf92baff131
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 05:20:23 +0000 (05:20 +0000)]
Remove unnecessary layer of obfuscation tBTA_GATTC_CMPL am:
af1c561f87 am:
ba77b130bd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1700123
Change-Id: I99a4790059573b57bbe9fdf0e9ffb85d89f5d7d7
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:29:25 +0000 (03:29 +0000)]
Straighten out tBTA_GATT_REASON am:
df50228be2 am:
f815c9659f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698153
Change-Id: I90eeffcfc700c6e971fc6093cb12a33ecd768878
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:43:56 +0000 (01:43 +0000)]
Add bta/hh/bta_hh_utils::bta_hh_get_cb am:
81f456dbd5 am:
b2d05bf963
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698930
Change-Id: I88c3cfd30bcb7f52849aac49b3e14f66b3cbefed
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:46:12 +0000 (22:46 +0000)]
Merge "Konstify kBTA_HH_LE_RECONN conditional" am:
2794735921 am:
68578be605
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698152
Change-Id: I744e3622161717e0b0eae0ae582479f572d9199d
Treehugger Robot [Sat, 8 May 2021 22:45:14 +0000 (22:45 +0000)]
[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am:
c2a57d7301 am:
52023daa9b -s ours
am skip reason: Merged-In I592c0a9c0e77869999357611aa99f3d9bc53b8b6 with SHA-1
9ca4c62ce5 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1700410
Change-Id: I7e890f0292d0e822fb318c08ee975a7802f42d9f
Xin Li [Sat, 8 May 2021 22:45:12 +0000 (22:45 +0000)]
[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am:
ebdfbedbe0 am:
3c29e8b9ba -s ours
am skip reason: Merged-In I592c0a9c0e77869999357611aa99f3d9bc53b8b6 with SHA-1
9ca4c62ce5 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1700410
Change-Id: I73ec065633cd2f6ebbeafc9586d2fd42eecadacb
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:52:47 +0000 (20:52 +0000)]
Merge "Remove bta_hh_is_le_device check" am:
935e5325b1 am:
1721a21088
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698149
Change-Id: Ia1f778a245346592d00606dd96be0424a76c91ef
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 18:09:25 +0000 (18:09 +0000)]
Merge "A2DP: Clear remote suspend flag if local is also stopping" am:
54154222cd am:
8991fc480d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690585
Change-Id: Ia996814527a640fb5868d0c308d29260248b0322
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:26:58 +0000 (23:26 +0000)]
Merge "Add default rustfmt.toml" am:
7acda66f83 am:
dd96003220
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1696170
Change-Id: If50613744972a79f86f7685a71e0a61672ac6480
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 22:11:44 +0000 (22:11 +0000)]
gd: Implement timeout callback for direct le connection am:
6fd78a704e am:
a54ec85387
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698250
Change-Id: I71ba563db96b4a68cd1b0587b5c4c918e2431b3c
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:12:00 +0000 (03:12 +0000)]
Merge "gd: Add parameter for background connection" am:
e63550100b am:
50715f3ada
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1697086
Change-Id: I5933b62087b7bfc8370fb1ac588d0ab2a375fe04
Chris Manton [Fri, 7 May 2021 03:11:56 +0000 (03:11 +0000)]
Re-log bta/hh/bta_hh_main::bta_hh_sm_execute am:
60cbde08a6 am:
a3d46041f7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698150
Change-Id: I93b485e57efa1004ee4676a3c4a227775e8e8ca4
Treehugger Robot [Fri, 7 May 2021 03:11:32 +0000 (03:11 +0000)]
Merge changes I7cc676cb,Ib2a58823,I2795f034,I5bb782f3,I6311bd6d, ... am:
308510f19d am:
9d882892b7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698148
Change-Id: I421e5cb10ef8a5f12aa019107249b2c3f33e34b9
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:24:49 +0000 (23:24 +0000)]
AsyncFd: clear_ready() before drop() am:
7258dad0d6 am:
bed19cae64
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1698065
Change-Id: Icdbf2c1cfadbcf3b01e8d0b201766170f753c1ed
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