git.osdn.net Git - android-x86/system-bt.git/log

Chris Manton [Mon, 10 May 2021 01:59:33 +0000 (01:59 +0000)]

Remove useless #def BTA_GATTC_MULTI_MAX am: 546049a5c2 am: 67741ade3d am: 3cc0ed25da

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698159

Change-Id: I9d47aa9061bc57b69c70496d8a595f04032c515f

commit | commitdiff | tree

Chris Manton [Mon, 10 May 2021 01:59:31 +0000 (01:59 +0000)]

Remove unused tBTA_GATT_REASON am: c30d36bf0f am: 255c36d28b am: 2928f1b7d9

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698154

Change-Id: I6b727898c9a0a91ac9a671a2a4ec5dfbf823b7c8

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Manton [Sun, 9 May 2021 22:07:00 +0000 (22:07 +0000)]

Stat-ify various bta/gatt/bta_gattc_act am: 2e9d317b2a am: c4e0be25fc am: c293e1aef8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1700405

Change-Id: If0b61c3457df7dee8355fd015a25fe6367949c4d

commit | commitdiff | tree

Chris Manton [Sun, 9 May 2021 22:06:57 +0000 (22:06 +0000)]

Conform btm_status_text to CASE_RETURN_TEXT convention am: 37f645f6f3 am: fb99abcbd4 am: 4fdcf5e953

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698156

Change-Id: I246368bda62d9e61664b8b08f0594e2f96366c2c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Manton [Sun, 9 May 2021 17:56:08 +0000 (17:56 +0000)]

Use proper types bta/hh//::BTM_STATUS am: e20ffdad66 am: 3fb2d1c977 am: bab0745fc4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698944

Change-Id: I62dc13e2871903b4b14a1b3a804497a2227a4869

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Manton [Sun, 9 May 2021 07:06:28 +0000 (07:06 +0000)]

Combine decl/defs bta/hh/bta_hh_le::bta_hh_gatt_close am: 4c4f9b58d4 am: 114a395d26 am: 5745ca8b0f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1699605

Change-Id: I4aef94524aaec81a225c0d02c1f253ba7dab25f4

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Manton [Sun, 9 May 2021 05:40:01 +0000 (05:40 +0000)]

Remove unnecessary layer of obfuscation tBTA_GATTC_CMPL am: af1c561f87 am: ba77b130bd am: 7eb2af27e7

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1700123

Change-Id: I28e00af67c01e2eadb40248ea2ce6c00b676a3ba

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Manton [Sun, 9 May 2021 03:54:58 +0000 (03:54 +0000)]

Straighten out tBTA_GATT_REASON am: df50228be2 am: f815c9659f am: 8349445bbd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698153

Change-Id: Ic6b6dad40300dbca3457174ee082f47971590d80

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Manton [Sun, 9 May 2021 02:01:46 +0000 (02:01 +0000)]

Add bta/hh/bta_hh_utils::bta_hh_get_cb am: 81f456dbd5 am: b2d05bf963 am: 969136aff4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698930

Change-Id: Ide5022dd81e5f329fc6afcd255b65cf88ca26f5d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Sat, 8 May 2021 23:08:08 +0000 (23:08 +0000)]

Merge "Konstify kBTA_HH_LE_RECONN conditional" am: 2794735921 am: 68578be605 am: 125021f153

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698152

Change-Id: Ic8659e148fbaeea38ff64113049301e940a609f3

commit | commitdiff | tree

Treehugger Robot [Sat, 8 May 2021 23:07:32 +0000 (23:07 +0000)]

[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: c2a57d7301 am: 52023daa9b -s ours am: c01f303aa1 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1700410

Change-Id: I6a683c01a891c2f56403a6aa7309e0ee03ac3782

[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: ebdfbedbe0 am: 3c29e8b9ba -s ours am: 6bfc278531 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1700410

Change-Id: I24d06f4cfa4169b61e23c41fa614454ca4aa7d9b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

[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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

DO NOT MERGE - Merge RQ2A.210505.003. am: ebdfbedbe0

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1700410

Change-Id: I41c9b5baffc1870a41cbae791c2d59c1e55031df

commit | commitdiff | tree

Treehugger Robot [Sat, 8 May 2021 21:44:04 +0000 (21:44 +0000)]

Merge "Konstify kBTA_HH_LE_RECONN conditional"

commit | commitdiff | tree

Treehugger Robot [Sat, 8 May 2021 21:38:01 +0000 (21:38 +0000)]

Merge "DO NOT MERGE - Merge RQ2A.210505.003."

commit | commitdiff | tree

Treehugger Robot [Sat, 8 May 2021 21:24:33 +0000 (21:24 +0000)]

Merge "Remove bta_hh_is_le_device check" am: 935e5325b1 am: 1721a21088 am: b63dade8fe

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698149

Change-Id: I03dc2bbe0c2c3666136f4af583d86fb52c78753a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Sat, 8 May 2021 20:25:37 +0000 (20:25 +0000)]

Merge "Remove bta_hh_is_le_device check"

commit | commitdiff | tree

Treehugger Robot [Sat, 8 May 2021 18:29:43 +0000 (18:29 +0000)]

Merge "A2DP: Clear remote suspend flag if local is also stopping" am: 54154222cd am: 8991fc480d am: 77a7a575b0

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1690585

Change-Id: I55e7f56cf444241792eb0161e7b899622a7c384b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Sat, 8 May 2021 17:34:29 +0000 (17:34 +0000)]

Merge "A2DP: Clear remote suspend flag if local is also stopping"

commit | commitdiff | tree

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

DO NOT MERGE - Merge RQ2A.210505.003.

Bug: 187544653
Merged-In: I592c0a9c0e77869999357611aa99f3d9bc53b8b6
Change-Id: I9b78552543c66bb607baee982d904e8939941cea

commit | commitdiff | tree

Treehugger Robot [Fri, 7 May 2021 23:45:55 +0000 (23:45 +0000)]

Merge "Add default rustfmt.toml" am: 7acda66f83 am: dd96003220 am: b07e99158e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1696170

Change-Id: I849cc2e2fe7d609a7a09abf728fb04de901c64ea

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Fri, 7 May 2021 22:41:49 +0000 (22:41 +0000)]

Merge "Add default rustfmt.toml"

gd: Implement timeout callback for direct le connection am: 6fd78a704e am: a54ec85387 am: 75cdfc24b2

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698250

Change-Id: I8d96ce4fae9d04fd0ea58fef4372d248bcbd7f59

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

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

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

commit | commitdiff | tree

Hansong Zhang [Tue, 4 May 2021 20:09:49 +0000 (20:09 +0000)]

Add default rustfmt.toml

Test: run rustfmt
Change-Id: I69b10b53cf339ea3d2769b1a524a82b777a0770d

commit | commitdiff | tree

Treehugger Robot [Fri, 7 May 2021 03:40:13 +0000 (03:40 +0000)]

Merge "gd: Add parameter for background connection" am: e63550100b am: 50715f3ada am: 29453fc5c4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1697086

Change-Id: Id4305f7afe6878727a7bda33292bec27ded54cce

commit | commitdiff | tree

Chris Manton [Fri, 7 May 2021 03:40:09 +0000 (03:40 +0000)]

Re-log bta/hh/bta_hh_main::bta_hh_sm_execute am: 60cbde08a6 am: a3d46041f7 am: 16960e6fe4

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698150

Change-Id: I4c9fdd4a997e52eff0e83984b39d984cc2435289

commit | commitdiff | tree

Treehugger Robot [Fri, 7 May 2021 03:39:56 +0000 (03:39 +0000)]

Merge changes I7cc676cb,Ib2a58823,I2795f034,I5bb782f3,I6311bd6d, ... am: 308510f19d am: 9d882892b7 am: 11a7a19677

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698148

Change-Id: I5c9244f6e281b8123dc1503a6e6f24345647e8c2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Fri, 7 May 2021 02:09:22 +0000 (02:09 +0000)]

Merge "gd: Add parameter for background connection"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Thu, 6 May 2021 23:41:56 +0000 (23:41 +0000)]

AsyncFd: clear_ready() before drop() am: 7258dad0d6 am: bed19cae64 am: 16a7bcd996

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1698065

Change-Id: Ib5b65907b8ba81bd32a66e69311a842b32a51717

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Wed, 10 Feb 2021 21:10:01 +0000 (13:10 -0800)]

DO NOT MERGE: BTA_HH_LE: Check nullptr

Bug: 179162240
Change-Id: Id1ef400a596d7a22492b30e36c4dd7f96054cab7
Tag: #security
Test: manual
Merged-In: Id1ef400a596d7a22492b30e36c4dd7f96054cab7

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Richard Smith [Thu, 6 May 2021 18:36:12 +0000 (18:36 +0000)]

[automerger skipped] Fix memory overflow. am: 0d93359dbb am: 4feb117a78 am: 0b62f0ebdf am: 500bd8b07c am: 0fa27964c2 am: d01f412564 -s ours am: 7e7b97de46 -s ours

am skip reason: Merged-In I1be3b836e09901c9cc614b02e21ae41b9a1ebfac with SHA-1 0d93359dbb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/14424506

Change-Id: I4ac13864a5135ff8f68cc60ad6bdd994b6bf6c56

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Manton [Thu, 6 May 2021 16:47:35 +0000 (16:47 +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 am: fc95aab2e1 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13954699

Change-Id: I3012497cba0e65d6bd7d873c17c42f0ea7137cf1

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 May 2021 16:47:31 +0000 (16:47 +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 am: 3ef3def453 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13954701

Change-Id: I34f7735e0bd833b488ba3d5599b02bf6c3bdc0d3

commit | commitdiff | tree

Chris Manton [Thu, 6 May 2021 16:47:28 +0000 (16:47 +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 am: 4ecac535fb -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13954701

Change-Id: I81a49cdd295918f2b75aaca09ecb36d11a618242

commit | commitdiff | tree

Richard Smith [Thu, 6 May 2021 16:30:52 +0000 (16:30 +0000)]

[automerger skipped] Fix memory overflow. am: 0d93359dbb am: 4feb117a78 am: 0b62f0ebdf am: 500bd8b07c am: 0fa27964c2 am: a89b8adb51 -s ours

am skip reason: Merged-In I1be3b836e09901c9cc614b02e21ae41b9a1ebfac with SHA-1 f9e37e3ea6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/14424506

Change-Id: I0437fc4a59f09509387e3251a30de30ccdbe65a7

commit | commitdiff | tree

Chris Manton [Thu, 6 May 2021 16:30:46 +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: c800d3f1f8 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13954699

Change-Id: Ifec640af6aa3da68196f2077d4ed019229cbd81c

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 May 2021 16:30:42 +0000 (16:30 +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: 95a082de32 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13954701

Change-Id: Iac41597806f1cad9387a7049ff9b9bcbc937cfae

commit | commitdiff | tree

Chris Manton [Thu, 6 May 2021 16:30:41 +0000 (16:30 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am: d667a2f6d0 -s ours am: 467701e9c8 -s ours am: d590155628 am: ab5477c3e2 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13954701

Change-Id: I46e11806a3ad8c700f8c56b4be898ac2d2d053c6

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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