OSDN Git Service
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: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 [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 [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
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
Richard Smith [Thu, 6 May 2021 18:02:18 +0000 (18:02 +0000)]
[automerger skipped] Fix memory overflow. am:
0d93359dbb am:
4feb117a78 am:
0b62f0ebdf am:
500bd8b07c am:
0fa27964c2 am:
d01f412564 -s ours
am skip reason: skipped by user jpawlowski
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14424506
Change-Id: Ib25d1a85f5090eb5a1424447f1423a6f7586ad63
Chris Manton [Thu, 6 May 2021 16:30:05 +0000 (16:30 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
4c9874d731 -s ours am:
e59c51d7f9 -s ours am:
5db6896649 am:
24c0d80295 -s ours am:
318b99bbce am:
5aba20ae85
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954699
Change-Id: I490d72c25023b98d1bb029100b694e50a9f726a1
TreeHugger Robot [Thu, 6 May 2021 16:29:59 +0000 (16:29 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-dev am:
f819730c62 am:
7a2d18ef0a -s ours am:
364371b9a9 am:
f3fe45e29c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I0c57e306f56997e85f5e9c9691eea90e137a632e
Chris Manton [Thu, 6 May 2021 16:29:56 +0000 (16:29 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
d667a2f6d0 -s ours am:
467701e9c8 -s ours am:
d590155628 am:
cf8d2a9ba9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I41b922675ed672138b8e3d1cf29144de0d411177
Richard Smith [Thu, 6 May 2021 16:15:20 +0000 (16:15 +0000)]
Fix memory overflow. am:
0d93359dbb am:
4feb117a78 am:
0b62f0ebdf am:
500bd8b07c am:
0fa27964c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14424506
Change-Id: Ie214accae5381cf5284a17aabe1e446c81a20c67
Chris Manton [Thu, 6 May 2021 16:15:12 +0000 (16:15 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
4c9874d731 -s ours am:
e59c51d7f9 -s ours am:
5db6896649 am:
24c0d80295 -s ours am:
318b99bbce
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954699
Change-Id: I0ed88ffcfb1b370b7eaf68f6d22b55ee8b6d41a3
TreeHugger Robot [Thu, 6 May 2021 16:15:09 +0000 (16:15 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-dev am:
f819730c62 am:
7a2d18ef0a -s ours am:
364371b9a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I75bd36511fcba3303f93b8ae50c6b62a0e6db6c8
Chris Manton [Thu, 6 May 2021 16:15:07 +0000 (16:15 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
d667a2f6d0 -s ours am:
467701e9c8 -s ours am:
d590155628
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I701a3132382eacf521cdeabf8b100ba9dd7d2d77
Richard Smith [Thu, 6 May 2021 16:00:28 +0000 (16:00 +0000)]
Fix memory overflow. am:
0d93359dbb am:
4feb117a78 am:
0b62f0ebdf am:
500bd8b07c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14424506
Change-Id: I6bb6e60065518d9641fa77857b61683f8baa26cf
Chris Manton [Thu, 6 May 2021 16:00:19 +0000 (16:00 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
4c9874d731 -s ours am:
e59c51d7f9 -s ours am:
5db6896649 am:
24c0d80295 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954699
Change-Id: I43c29ba819826b56a3549885938f8179fbfe8e04
TreeHugger Robot [Thu, 6 May 2021 16:00:05 +0000 (16:00 +0000)]
[automerger skipped] Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-dev am:
f819730c62 am:
7a2d18ef0a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I5d79a3a7966ab6fa7b6cd37354e552b5070b3966
Chris Manton [Thu, 6 May 2021 16:00:02 +0000 (16:00 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
d667a2f6d0 -s ours am:
467701e9c8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I2079fb2b8678aee870c8748b13ced769b72891d0
Richard Smith [Thu, 6 May 2021 15:45:21 +0000 (15:45 +0000)]
Fix memory overflow. am:
0d93359dbb am:
4feb117a78 am:
0b62f0ebdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14424506
Change-Id: I72589c4284074ca76bdc7f27fc2394d84e5125a6
Chris Manton [Thu, 6 May 2021 15:45:13 +0000 (15:45 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
4c9874d731 -s ours am:
e59c51d7f9 -s ours am:
5db6896649
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954699
Change-Id: I3fc0547226195145cb7d5ae36e23c229d154683a
TreeHugger Robot [Thu, 6 May 2021 15:45:03 +0000 (15:45 +0000)]
Merge "RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write" into qt-dev am:
f819730c62
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: Iee27d0a5c0ae2645f7a843336ceaf91a2552f6fa
Chris Manton [Thu, 6 May 2021 15:45:01 +0000 (15:45 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
d667a2f6d0 -s ours
am skip reason: skipped by user cmanton
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954701
Change-Id: I0bda5654aa90b136fef137dc6e24176c9888ff78
Richard Smith [Thu, 6 May 2021 13:14:05 +0000 (13:14 +0000)]
Fix memory overflow. am:
0d93359dbb am:
4feb117a78
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14424506
Change-Id: If03b2528de76c1be7bba7eb620f31aee5aba80d2
Richard Smith [Thu, 6 May 2021 12:42:06 +0000 (12:42 +0000)]
Fix memory overflow. am:
0d93359dbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
14424506
Change-Id: I22f05c6fc477e6b2bbe8af4541a9e69854787216
Richard Smith [Mon, 22 Feb 2021 14:25:43 +0000 (14:25 +0000)]
Fix memory overflow.
Bug:
180939982
Merged-In: I1be3b836e09901c9cc614b02e21ae41b9a1ebfac
Change-Id: I1be3b836e09901c9cc614b02e21ae41b9a1ebfac
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:58:57 +0000 (06:58 +0000)]
Merge "gd: Handle LE advertisement tracking sub-event" am:
db191f3db3 am:
b9b8946de9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1693508
Change-Id: Ide1a6a449521a87bb7a84e04e472fd7ada29aa28
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 04:06:16 +0000 (04:06 +0000)]
gd: Check stack is running before getting storage am:
fa8926ba7b am:
be48310d20
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1697085
Change-Id: I2629263215f0113741e849793134bd283956239e
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 [Wed, 5 May 2021 00:19:00 +0000 (00:19 +0000)]
Merge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5 am:
a69349e3ad am:
6e93925448
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1695079
Change-Id: I3cab4a4e0394419b687be3339b2c0505362fce89
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:54:21 +0000 (22:54 +0000)]
Merge "Parse scan_data_resp of advertisement tracking event correctly" am:
08f674c623 am:
35f284f82d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1695545
Change-Id: I5076439eadd56dcb92a6e7397ef6d10fa042ba5a
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 22:06:49 +0000 (22:06 +0000)]
Merge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f am:
0a9ce6af0e am:
70e155502e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687554
Change-Id: I4aa9415392cc485331dc7dee6b47c4c82af7e93d
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
Martin Brabham [Tue, 4 May 2021 20:25:12 +0000 (20:25 +0000)]
Merge "OOB: Add public address to OOB data" am:
6107593afb am:
3d32a225dd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692382
Change-Id: I31446a25a68580313cc74d864bd6715e5fc47b77
Sonny Sasaka [Tue, 4 May 2021 20:25:01 +0000 (20:25 +0000)]
Merge "Add rust binaries to link with C++ staticlib" am:
0ccbc22083 am:
5055146d07
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1686947
Change-Id: Ic6f3afcd575fd73d61d020a3694a77374a92a94c
Sonny Sasaka [Tue, 4 May 2021 20:24:55 +0000 (20:24 +0000)]
Merge "Add TARGET_FLOSS define" am:
86cbc1a913 am:
6bd555c46c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1686946
Change-Id: Ibbfef5a3306a4e126d76dbf0bbf151c4ebec1ed4
OSDN Git Service
