OSDN Git Service

android-x86/system-bt.git
3 years agoRemove unused parameter in avdt_ad_tc_close_ind am: 1510436dd6 am: 48f5fffbf0
Hansong Zhang [Wed, 23 Sep 2020 22:33:11 +0000 (22:33 +0000)]
Remove unused parameter in avdt_ad_tc_close_ind am: 1510436dd6 am: 48f5fffbf0

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

Change-Id: I28eb9b7d9e2e14426874247842f2f00b865c93b1

3 years agoRemove unused parameter in avdt_ad_tc_close_ind am: 1510436dd6
Hansong Zhang [Wed, 23 Sep 2020 22:14:07 +0000 (22:14 +0000)]
Remove unused parameter in avdt_ad_tc_close_ind am: 1510436dd6

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

Change-Id: I8d53b55def1c9757c2f9185f1b85a6f1ce600f17

3 years agoRemove unused parameter in avdt_ad_tc_close_ind
Hansong Zhang [Wed, 23 Sep 2020 04:58:21 +0000 (21:58 -0700)]
Remove unused parameter in avdt_ad_tc_close_ind

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I888bb41bc28378406d441856ac1e615eb8c970a2

3 years agoMerge "NameDB: Actually remove the address from requested addresses" am: be6fa9814b...
Treehugger Robot [Wed, 23 Sep 2020 21:40:34 +0000 (21:40 +0000)]
Merge "NameDB: Actually remove the address from requested addresses" am: be6fa9814b am: 39bc6765a3

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

Change-Id: Ia31d75a665ac548b5b462b601c67846b17013230

3 years agoMerge "NameDB: Actually remove the address from requested addresses" am: be6fa9814b
Treehugger Robot [Wed, 23 Sep 2020 20:47:31 +0000 (20:47 +0000)]
Merge "NameDB: Actually remove the address from requested addresses" am: be6fa9814b

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

Change-Id: Ibfe7ee87932b6c67755d64a5932aaa9c83bb1f96

3 years agoMerge "NameDB: Actually remove the address from requested addresses"
Treehugger Robot [Wed, 23 Sep 2020 20:31:05 +0000 (20:31 +0000)]
Merge "NameDB: Actually remove the address from requested addresses"

3 years agoGATT: Put L2cap disconnect logic together am: 5e132b82be am: 21aae3372d
Hansong Zhang [Wed, 23 Sep 2020 20:21:26 +0000 (20:21 +0000)]
GATT: Put L2cap disconnect logic together am: 5e132b82be am: 21aae3372d

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

Change-Id: Id01962a366ea7bfb9546fdf93e0ede64095109ba

3 years agoSDP: Remove sdp_disconnect_cfm am: 9f00dd8605 am: e14d7cefec
Hansong Zhang [Wed, 23 Sep 2020 20:21:25 +0000 (20:21 +0000)]
SDP: Remove sdp_disconnect_cfm am: 9f00dd8605 am: e14d7cefec

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

Change-Id: Ie4e504e121d9c6cd2927dd6c4ad4c8399a66bb54

3 years agoL2c_int: Remove unused function am: 5138be321b am: 3010d7b075
Hansong Zhang [Wed, 23 Sep 2020 20:21:23 +0000 (20:21 +0000)]
L2c_int: Remove unused function am: 5138be321b am: 3010d7b075

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

Change-Id: I6a19542f33285781523dc48f8b3f8abb8aed5b32

3 years agoSend L2CA_DisconnectRsp from L2cap state machine am: 7886f18a7f am: 272768563f
Hansong Zhang [Wed, 23 Sep 2020 20:21:19 +0000 (20:21 +0000)]
Send L2CA_DisconnectRsp from L2cap state machine am: 7886f18a7f am: 272768563f

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

Change-Id: I436bcd58822808fe893833dbd61631491b50eef5

3 years agoSDP_BROWSE_PLUS is never true am: 6065a41765 am: f1f3bc62d5
Hansong Zhang [Wed, 23 Sep 2020 20:20:24 +0000 (20:20 +0000)]
SDP_BROWSE_PLUS is never true am: 6065a41765 am: f1f3bc62d5

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

Change-Id: Ifbe76b71c6e6017a5023e163b9f5ef89e2258623

3 years agoGATT: Put L2cap disconnect logic together am: 5e132b82be
Hansong Zhang [Wed, 23 Sep 2020 20:06:09 +0000 (20:06 +0000)]
GATT: Put L2cap disconnect logic together am: 5e132b82be

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

Change-Id: I5c7fa8283caba83ff69b258cda1288cf7660d64b

3 years agoSDP: Remove sdp_disconnect_cfm am: 9f00dd8605
Hansong Zhang [Wed, 23 Sep 2020 20:06:05 +0000 (20:06 +0000)]
SDP: Remove sdp_disconnect_cfm am: 9f00dd8605

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

Change-Id: I2476f18919adaaa94821a4d16fe4db8654fb8639

3 years agoL2c_int: Remove unused function am: 5138be321b
Hansong Zhang [Wed, 23 Sep 2020 20:06:03 +0000 (20:06 +0000)]
L2c_int: Remove unused function am: 5138be321b

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

Change-Id: I83bccd0217710dc338b4632b6e3e35efdac59e14

3 years agoSend L2CA_DisconnectRsp from L2cap state machine am: 7886f18a7f
Hansong Zhang [Wed, 23 Sep 2020 20:05:57 +0000 (20:05 +0000)]
Send L2CA_DisconnectRsp from L2cap state machine am: 7886f18a7f

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

Change-Id: I99c710d60378359865ff1b9c585e0c4416a17ef4

3 years agoSDP_BROWSE_PLUS is never true am: 6065a41765
Hansong Zhang [Wed, 23 Sep 2020 20:05:01 +0000 (20:05 +0000)]
SDP_BROWSE_PLUS is never true am: 6065a41765

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

Change-Id: I56019cf71ede4273996ef381f82fe4d77680eead

3 years agoGATT: Put L2cap disconnect logic together
Hansong Zhang [Wed, 23 Sep 2020 04:54:33 +0000 (21:54 -0700)]
GATT: Put L2cap disconnect logic together

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ida76c6223bdcb61153aa0a422e8f47468a58c368

3 years agoSDP: Remove sdp_disconnect_cfm
Hansong Zhang [Wed, 23 Sep 2020 04:37:08 +0000 (21:37 -0700)]
SDP: Remove sdp_disconnect_cfm

Just invoke the callbacks when we send disconnect request.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I734119e5aaaea05eeaf0d1d272865cf420d03862

3 years agoL2c_int: Remove unused function
Hansong Zhang [Wed, 23 Sep 2020 03:49:17 +0000 (20:49 -0700)]
L2c_int: Remove unused function

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifae9b801dda409671785f7f0be9b2f9cf8f3c53b

3 years agoSend L2CA_DisconnectRsp from L2cap state machine
Hansong Zhang [Tue, 22 Sep 2020 23:46:48 +0000 (16:46 -0700)]
Send L2CA_DisconnectRsp from L2cap state machine

Instead of having client send it.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id27fa866aaa059dcc7302d5b8a871087d42547ed

3 years agoSDP_BROWSE_PLUS is never true
Hansong Zhang [Tue, 22 Sep 2020 22:56:54 +0000 (15:56 -0700)]
SDP_BROWSE_PLUS is never true

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0a0a579320cb2e58d49e21826ce84e3198e1a5c9

3 years agoRe-log stack/acl/btm_acl::btm_acl_created am: 305d1c935b am: 47449c4745
Chris Manton [Wed, 23 Sep 2020 06:57:57 +0000 (06:57 +0000)]
Re-log stack/acl/btm_acl::btm_acl_created am: 305d1c935b am: 47449c4745

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

Change-Id: I7d871786b4f2c575caf1aee41a881f58548bcb91

3 years agoAdd types::BtTransportText am: a1b578c2a4 am: 58ebe435c4
Chris Manton [Wed, 23 Sep 2020 06:57:55 +0000 (06:57 +0000)]
Add types::BtTransportText am: a1b578c2a4 am: 58ebe435c4

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

Change-Id: Iae40affc5aba177ae6cba80825853b4a3da2c1f6

3 years agoAdd hci role text am: 68559b914b am: 4f6044ba47
Chris Manton [Wed, 23 Sep 2020 06:57:54 +0000 (06:57 +0000)]
Add hci role text am: 68559b914b am: 4f6044ba47

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

Change-Id: Ifbfe4367b6910793ab7763960e30fa22683f0cca

3 years agoenum-ify stack/include/hcidefs::HCI_ROLE_ am: 6677e573d7 am: fffb91195b
Chris Manton [Wed, 23 Sep 2020 06:57:52 +0000 (06:57 +0000)]
enum-ify stack/include/hcidefs::HCI_ROLE_ am: 6677e573d7 am: fffb91195b

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

Change-Id: Ic9d0b1503db93b3f53a41a272df779d10a2e4eea

3 years agoRe-Var stack/acl/btm_acl::btm_acl_created am: 437a21aede am: c612c8948b
Chris Manton [Wed, 23 Sep 2020 06:57:49 +0000 (06:57 +0000)]
Re-Var stack/acl/btm_acl::btm_acl_created am: 437a21aede am: c612c8948b

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

Change-Id: I80ab22e6ecb7a6b12c3e5e6c4a52df0de2bcbc1f

3 years agoRe-log stack/acl/btm_acl::btm_acl_created am: 305d1c935b
Chris Manton [Wed, 23 Sep 2020 06:19:57 +0000 (06:19 +0000)]
Re-log stack/acl/btm_acl::btm_acl_created am: 305d1c935b

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

Change-Id: Ib01216b8a8f12184c1dbf78f4b2e7ce6b94e7c13

3 years agoAdd types::BtTransportText am: a1b578c2a4
Chris Manton [Wed, 23 Sep 2020 06:19:54 +0000 (06:19 +0000)]
Add types::BtTransportText am: a1b578c2a4

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

Change-Id: Id6dd74756ea761bc3d087ca86a392b5ec415726d

3 years agoAdd hci role text am: 68559b914b
Chris Manton [Wed, 23 Sep 2020 06:19:50 +0000 (06:19 +0000)]
Add hci role text am: 68559b914b

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

Change-Id: I43684652b65d73cdcc6b79e6c189f91fa7e1a134

3 years agoenum-ify stack/include/hcidefs::HCI_ROLE_ am: 6677e573d7
Chris Manton [Wed, 23 Sep 2020 06:19:46 +0000 (06:19 +0000)]
enum-ify stack/include/hcidefs::HCI_ROLE_ am: 6677e573d7

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

Change-Id: Ifede4816744fb3112c866a9c993d5357a5b66688

3 years agoRe-Var stack/acl/btm_acl::btm_acl_created am: 437a21aede
Chris Manton [Wed, 23 Sep 2020 06:18:58 +0000 (06:18 +0000)]
Re-Var stack/acl/btm_acl::btm_acl_created am: 437a21aede

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

Change-Id: I300dcd65515cdec1327ad401aa949734fa831f68

3 years agoMerge "SDP: We always use basic mode" am: 863b2e30aa am: eb2b9ed70c
Treehugger Robot [Wed, 23 Sep 2020 04:13:37 +0000 (04:13 +0000)]
Merge "SDP: We always use basic mode" am: 863b2e30aa am: eb2b9ed70c

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

Change-Id: I41322c83179c2bca7cbbc1f32a6fcbf86a54e27e

3 years agoMerge "SDP: We always use basic mode" am: 863b2e30aa
Treehugger Robot [Wed, 23 Sep 2020 04:05:17 +0000 (04:05 +0000)]
Merge "SDP: We always use basic mode" am: 863b2e30aa

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

Change-Id: I0dc4c19cb154df25a7ad46d3c2b6422ae0315925

3 years agoMerge "[fuzzing] Add liblog dependency." am: 022b3c1461 am: 97c1f6a6b7
Treehugger Robot [Wed, 23 Sep 2020 04:05:15 +0000 (04:05 +0000)]
Merge "[fuzzing] Add liblog dependency." am: 022b3c1461 am: 97c1f6a6b7

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

Change-Id: Id7192326dda143e2ef972a54cda75e0adee6b0ea

3 years agoRe-log stack/acl/btm_acl::btm_acl_created
Chris Manton [Tue, 22 Sep 2020 20:53:47 +0000 (13:53 -0700)]
Re-log stack/acl/btm_acl::btm_acl_created

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I43713ef1a4eb7dd4ad62865056e8f05c2455277d

3 years agoAdd types::BtTransportText
Chris Manton [Sat, 19 Sep 2020 01:11:17 +0000 (18:11 -0700)]
Add types::BtTransportText

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I6fc84ef84a169f2a04b9aa7726206c58d8848021

3 years agoAdd hci role text
Chris Manton [Mon, 21 Sep 2020 20:55:50 +0000 (13:55 -0700)]
Add hci role text

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I713403023a53905821e39ad9a8251bab9a8779ca

3 years agoenum-ify stack/include/hcidefs::HCI_ROLE_
Chris Manton [Sat, 19 Sep 2020 20:47:45 +0000 (13:47 -0700)]
enum-ify stack/include/hcidefs::HCI_ROLE_

Also add typed storage

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I7d7097e8ba92bd6035ba027df93a905274eaec27

3 years agoRe-Var stack/acl/btm_acl::btm_acl_created
Chris Manton [Tue, 22 Sep 2020 20:21:58 +0000 (13:21 -0700)]
Re-Var stack/acl/btm_acl::btm_acl_created

Because 'p' is a terrible variable name

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I78ef2c1051ba151dbe605114aa5c45097f29bcde

3 years agoMerge "SDP: We always use basic mode"
Treehugger Robot [Wed, 23 Sep 2020 03:47:51 +0000 (03:47 +0000)]
Merge "SDP: We always use basic mode"

3 years agoMerge "[fuzzing] Add liblog dependency." am: 022b3c1461
Treehugger Robot [Wed, 23 Sep 2020 03:27:28 +0000 (03:27 +0000)]
Merge "[fuzzing] Add liblog dependency." am: 022b3c1461

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

Change-Id: I663aa958d1eef6c21c3f54b6558508015ade1d5a

3 years agoMerge "[fuzzing] Add liblog dependency."
Treehugger Robot [Wed, 23 Sep 2020 03:03:01 +0000 (03:03 +0000)]
Merge "[fuzzing] Add liblog dependency."

3 years ago[fuzzing] Add liblog dependency.
Mitch Phillips [Tue, 22 Sep 2020 20:44:23 +0000 (13:44 -0700)]
[fuzzing] Add liblog dependency.

Static dependencies don't carry transient dynamic dependencies to the
link line. We need to link liblog as it's a necessary dependency, and
this is revealed with a new toolchain update. For more info, see the
bug.

Tag: #refactor
Bug: 131771163
Test: gd/fuzz/run libosi_fuzz_list
Change-Id: I9404ef275cf1814ac4803d8478af46cd949cd8e7

3 years agoNameDB: Actually remove the address from requested addresses
Martin Brabham [Tue, 22 Sep 2020 00:17:25 +0000 (17:17 -0700)]
NameDB: Actually remove the address from requested addresses

When a ReadRemoteName is called, there is a single PendingRemoteNameRead
struct that is set.  This contains the callback and handler.  Once this
is set, you cannot set another.  The initial problem is that in the
OnRemoteReadResponse we never remove it from an internal tracking map.
This map prevents us from making duplicate requests which is good, but
since it's never removed, we can only request one time.

This CL fixes that by removing it in the OnRemoteReadResponse.

Additionally, from an API standpoint we want to provide a functioning
API.  If a caller requests a name read and provides a callback, then why
not just call their callback when we get the data instead of telling
them we can't meet their needs (which is untrue).

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I55e41905cde5146bcb06b39078a02aa9ed059ab3

3 years agoMerge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ... am: bd7291ad19...
Treehugger Robot [Tue, 22 Sep 2020 23:08:29 +0000 (23:08 +0000)]
Merge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ... am: bd7291ad19 am: 090d096d84

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

Change-Id: I32bc4d31f4e1e814682d5137613549e57af73c19

3 years agoSDP: We always use basic mode
Hansong Zhang [Tue, 22 Sep 2020 22:30:06 +0000 (15:30 -0700)]
SDP: We always use basic mode

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I841a432c39299eb28ef3c63d3af65204821735c6

3 years agoMerge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ... am: bd7291ad19
Treehugger Robot [Tue, 22 Sep 2020 22:48:05 +0000 (22:48 +0000)]
Merge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ... am: bd7291ad19

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

Change-Id: I8f4112d16014be6d7756da9c898d519cd921f4ab

3 years agoMerge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ...
Treehugger Robot [Tue, 22 Sep 2020 22:27:50 +0000 (22:27 +0000)]
Merge changes I05ccdb3e,I00065f65,I2310c69c,I8832601e,I55ec884b, ...

* changes:
  enum-ify stack/btm/btm_ble_int_types::tBTM_BLE_SEC_REQ_ACT
  enumify tL2C_CB::tL2C_LCB::conn_update_mask
  Remove unnecesary warning on expected parsing failure
  Only read power mode on non-le links
  Add helpers tL2C_CB::tL2C_LCB::tBT_TRANSPORT
  Streamline stack/l2cap/l2c_link::l2c_link_check_power_mode
  Internally link stack/l2cap/l2c_link::l2c_link_check_power_mode
  Remove def stack/l2cap/l2c_link::L2C_LINK_CHECK_POWER_MODE
  Slight cleanup stack/acl/btm_pm::BTM_SetSsrParams
  Specialize data structures tBTM_PM_STATUS tBTM_PM_MODE

3 years agoMerge "stack: Periodic advertising scanner implementation" am: a842768eb8 am: 692111f292
Jakub Pawlowski [Tue, 22 Sep 2020 21:41:55 +0000 (21:41 +0000)]
Merge "stack: Periodic advertising scanner implementation" am: a842768eb8 am: 692111f292

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

Change-Id: I5c02a59aac36935900abae9687e914d2ca16f985

3 years agoMerge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev am: a6d074922e
Jakub Pawlowski [Tue, 22 Sep 2020 21:31:41 +0000 (21:31 +0000)]
Merge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev am: a6d074922e

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

Change-Id: I2608dcb1c9c9031bacfaba1b715974d9f98c7391

3 years agoMerge "stack: Periodic advertising scanner implementation" am: a842768eb8
Jakub Pawlowski [Tue, 22 Sep 2020 21:23:15 +0000 (21:23 +0000)]
Merge "stack: Periodic advertising scanner implementation" am: a842768eb8

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

Change-Id: Ifa2344d78c59419db64f663dcb09ff473cd18689

3 years agoMerge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev
Jakub Pawlowski [Tue, 22 Sep 2020 21:14:20 +0000 (21:14 +0000)]
Merge "fix oob in avrc_ctrl_pars_vendor_cmd" into rvc-dev

3 years agoMerge "stack: Periodic advertising scanner implementation"
Jakub Pawlowski [Tue, 22 Sep 2020 21:08:44 +0000 (21:08 +0000)]
Merge "stack: Periodic advertising scanner implementation"

3 years agoenum-ify stack/btm/btm_ble_int_types::tBTM_BLE_SEC_REQ_ACT
Chris Manton [Fri, 18 Sep 2020 15:54:40 +0000 (08:54 -0700)]
enum-ify stack/btm/btm_ble_int_types::tBTM_BLE_SEC_REQ_ACT

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I05ccdb3e4b1b42810f77a4d6322606434a4b58c7

3 years agoenumify tL2C_CB::tL2C_LCB::conn_update_mask
Chris Manton [Fri, 4 Sep 2020 01:42:14 +0000 (18:42 -0700)]
enumify tL2C_CB::tL2C_LCB::conn_update_mask

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I00065f6573074738be0860365038a73f8b587e2e

3 years agoRemove unnecesary warning on expected parsing failure
Chris Manton [Thu, 3 Sep 2020 21:08:58 +0000 (14:08 -0700)]
Remove unnecesary warning on expected parsing failure

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I2310c69cf6b40e494d9aa191da590a8ea89c7e16

3 years agoOnly read power mode on non-le links
Chris Manton [Thu, 3 Sep 2020 17:28:24 +0000 (10:28 -0700)]
Only read power mode on non-le links

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I8832601ee35a0054085917cf92c6f51ca7f5aa4c

3 years agoAdd helpers tL2C_CB::tL2C_LCB::tBT_TRANSPORT
Chris Manton [Thu, 3 Sep 2020 17:24:13 +0000 (10:24 -0700)]
Add helpers tL2C_CB::tL2C_LCB::tBT_TRANSPORT

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I55ec884b8fbff02337b02616ba56566c908aebf4

3 years agoStreamline stack/l2cap/l2c_link::l2c_link_check_power_mode
Chris Manton [Thu, 3 Sep 2020 17:20:16 +0000 (10:20 -0700)]
Streamline stack/l2cap/l2c_link::l2c_link_check_power_mode

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ie696eafbc080777850b71ac5fad846ffcfc2ec8c

3 years agoInternally link stack/l2cap/l2c_link::l2c_link_check_power_mode
Chris Manton [Thu, 3 Sep 2020 17:16:41 +0000 (10:16 -0700)]
Internally link stack/l2cap/l2c_link::l2c_link_check_power_mode

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: If653303d78db7ed0dea16ef6dfff1de7c2766d74

3 years agoRemove def stack/l2cap/l2c_link::L2C_LINK_CHECK_POWER_MODE
Chris Manton [Thu, 3 Sep 2020 17:14:30 +0000 (10:14 -0700)]
Remove def stack/l2cap/l2c_link::L2C_LINK_CHECK_POWER_MODE

Unnecessary layer of indirection

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I0e99b5df8fb0f2f678ae94320b1daaac78d606dd

3 years agoSlight cleanup stack/acl/btm_pm::BTM_SetSsrParams
Chris Manton [Thu, 3 Sep 2020 16:59:12 +0000 (09:59 -0700)]
Slight cleanup stack/acl/btm_pm::BTM_SetSsrParams

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I66a26522b52ffb15bbf38424ee0f06ab2daa1ef5

3 years agoSpecialize data structures tBTM_PM_STATUS tBTM_PM_MODE
Chris Manton [Thu, 3 Sep 2020 16:04:58 +0000 (09:04 -0700)]
Specialize data structures tBTM_PM_STATUS tBTM_PM_MODE

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I4868fd81c0a5c6c788382f0c81a4d908685642e6

3 years agoMerge "Revert "HciHalTest: Handle EINTR when reading"" am: 2ba2de8ca1 am: c64548e4ca
Treehugger Robot [Tue, 22 Sep 2020 19:32:37 +0000 (19:32 +0000)]
Merge "Revert "HciHalTest: Handle EINTR when reading"" am: 2ba2de8ca1 am: c64548e4ca

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

Change-Id: I4f2fc0fc24c3bde812524ad2ccac50b578b3233f

3 years agoMerge "GD-HCI: Add verbose logging for Tx and Rx packets" am: 1789721f4e am: bc71fa5b28
Treehugger Robot [Tue, 22 Sep 2020 19:32:14 +0000 (19:32 +0000)]
Merge "GD-HCI: Add verbose logging for Tx and Rx packets" am: 1789721f4e am: bc71fa5b28

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

Change-Id: I96968f3513c9e553641e23739eebf1fe37844b08

3 years agoMerge "Revert "HciHalTest: Handle EINTR when reading"" am: 2ba2de8ca1
Treehugger Robot [Tue, 22 Sep 2020 19:13:38 +0000 (19:13 +0000)]
Merge "Revert "HciHalTest: Handle EINTR when reading"" am: 2ba2de8ca1

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

Change-Id: I808b6706e61337ccdc9fe1dfdd94286e2af94578

3 years agoMerge "GD-HCI: Add verbose logging for Tx and Rx packets" am: 1789721f4e
Treehugger Robot [Tue, 22 Sep 2020 19:12:38 +0000 (19:12 +0000)]
Merge "GD-HCI: Add verbose logging for Tx and Rx packets" am: 1789721f4e

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

Change-Id: I28b5ec65ee7842018d3591c6c7b101109722eae7

3 years agoMerge "Revert "HciHalTest: Handle EINTR when reading""
Treehugger Robot [Tue, 22 Sep 2020 19:01:47 +0000 (19:01 +0000)]
Merge "Revert "HciHalTest: Handle EINTR when reading""

3 years agoMerge "GD-HCI: Add verbose logging for Tx and Rx packets"
Treehugger Robot [Tue, 22 Sep 2020 18:51:25 +0000 (18:51 +0000)]
Merge "GD-HCI: Add verbose logging for Tx and Rx packets"

3 years agoRevert "HciHalTest: Handle EINTR when reading"
Myles Watson [Tue, 22 Sep 2020 16:03:04 +0000 (16:03 +0000)]
Revert "HciHalTest: Handle EINTR when reading"

This reverts commit 46808b2623f5ea68899a26bf3fa9782c6425cb69.

Reason for revert: EINTR shouldn't happen with a local socket.  This is overkill.

Bug: 168760472
Change-Id: I5dc8e6eb9ee7c360e802452a1ffe804d65f20561
Tag: #gd-refactor
Test: atest bluetooth_test_gd

3 years agostack: Periodic advertising scanner implementation
Jakub Tyszkowski [Thu, 30 Apr 2020 10:42:01 +0000 (12:42 +0200)]
stack: Periodic advertising scanner implementation

This adds the ble_scanner_hci_interface for periodic advertising scan
and all the low level HCI commands and event handlers.

Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: compilation
Change-Id: I20e7057a8806c5ca8ef9e7261e1c2b446135cbed

3 years agoGD-HCI: Add verbose logging for Tx and Rx packets
Jack He [Tue, 22 Sep 2020 03:40:15 +0000 (20:40 -0700)]
GD-HCI: Add verbose logging for Tx and Rx packets

* Add StringFormat method
* Add verbose logging in GD Android HIDL client for every outgoing
  HCI transmission and incoming HCI transmission

Bug: 164973960
Test: make, atest bluetooth_test_gd, listen to music
Tag: #gd-refactor
Change-Id: I1b12c0180b835d9a0f3f641d80b62131e5b72fd4

3 years agoUse acl ble stack/acl/::acl_ble_connection_ am: 5629a64e8f am: 7c863c0633
Chris Manton [Tue, 22 Sep 2020 01:40:35 +0000 (01:40 +0000)]
Use acl ble stack/acl/::acl_ble_connection_ am: 5629a64e8f am: 7c863c0633

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

Change-Id: Ibe6dc8fdcc5cdb1ac9a2d91c70bee6908f00868b

3 years agoUse acl ble stack/acl/::acl_ble_connection_ am: 5629a64e8f
Chris Manton [Tue, 22 Sep 2020 00:59:09 +0000 (00:59 +0000)]
Use acl ble stack/acl/::acl_ble_connection_ am: 5629a64e8f

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

Change-Id: Id183c1c85351c7ebdd8e450db1afed286c7580b9

3 years ago[automerger skipped] Merge "HciHalRootCanalTest: Use ASSERT and retry reads" into...
TreeHugger Robot [Tue, 22 Sep 2020 00:31:25 +0000 (00:31 +0000)]
[automerger skipped] Merge "HciHalRootCanalTest: Use ASSERT and retry reads" into rvc-dev am: ae8049033b -s ours

am skip reason: Change-Id I4a69e172eda911e24ecf7482cd88a724139ca29d with SHA-1 3478451ff1 is in history

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

Change-Id: I3d2afbf2ce786038680a9dae4296a4ca41643ef2

3 years agoMerge "HciHalRootCanalTest: Use ASSERT and retry reads" into rvc-dev
TreeHugger Robot [Tue, 22 Sep 2020 00:07:05 +0000 (00:07 +0000)]
Merge "HciHalRootCanalTest: Use ASSERT and retry reads" into rvc-dev

3 years agoMerge changes I9c6cce21,I808a6fd2,I263e4cfd,I522fcfa3,I6abb2319, ... am: b162b52cd7...
Treehugger Robot [Mon, 21 Sep 2020 22:57:09 +0000 (22:57 +0000)]
Merge changes I9c6cce21,I808a6fd2,I263e4cfd,I522fcfa3,I6abb2319, ... am: b162b52cd7 am: e4f6f1ecdf

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

Change-Id: I53378d33c113ce2378cbf63b32313975caccf6cb

3 years agoMerge changes I9c6cce21,I808a6fd2,I263e4cfd,I522fcfa3,I6abb2319, ... am: b162b52cd7
Treehugger Robot [Mon, 21 Sep 2020 22:40:53 +0000 (22:40 +0000)]
Merge changes I9c6cce21,I808a6fd2,I263e4cfd,I522fcfa3,I6abb2319, ... am: b162b52cd7

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

Change-Id: I93332c641377e15c9a21343d390a78a7581c6310

3 years agoUse acl ble stack/acl/::acl_ble_connection_
Chris Manton [Mon, 21 Sep 2020 17:32:35 +0000 (10:32 -0700)]
Use acl ble stack/acl/::acl_ble_connection_

Also restore propogation of properly resolved ble address

acl_ble_connection_complete
acl_ble_enhanced_connection_complete
acl_ble_connection_fail

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: Ibf8c6355697ef82c97d1b55332792908c494b743

3 years agoMerge "Remove unneeded cflags and ldflags" am: 1fac7a1259 am: 5a9e0359a9
Treehugger Robot [Mon, 21 Sep 2020 22:04:05 +0000 (22:04 +0000)]
Merge "Remove unneeded cflags and ldflags" am: 1fac7a1259 am: 5a9e0359a9

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

Change-Id: I4ff7a38a1e9291324cc7ba6565db28041bfc31fa

3 years agoMerge changes I9c6cce21,I808a6fd2,I263e4cfd,I522fcfa3,I6abb2319, ...
Treehugger Robot [Mon, 21 Sep 2020 22:02:27 +0000 (22:02 +0000)]
Merge changes I9c6cce21,I808a6fd2,I263e4cfd,I522fcfa3,I6abb2319, ...

* changes:
  Remove unused stack/btm/btm_ble_int_types::tINQ_LE_BDADDR
  Remove constant var tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::scan_duplicate_filter
  Remove never-set vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::
  Add Api tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_mode
  Remove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB
  Expand clever stack/btm/btm_ble_gap::btm_set_conn_mode_adv_init_addr
  Remove tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::tx_power
  Remove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB
  Remove never-set var tBTM_CB::tBTM_BLE_CB::mixed_mode
  Const-ify size tBTM_CB::tBTM_BLE_CB::link_count[]
  Remove unused var tBTM_CB::tBTM_BLE_CB::enabled
  Add Api around tBTM_CB::paging
  Remove tBTM_CB::discing can never be true

3 years agoMerge "Remove unneeded cflags and ldflags" am: 1fac7a1259
Treehugger Robot [Mon, 21 Sep 2020 21:35:18 +0000 (21:35 +0000)]
Merge "Remove unneeded cflags and ldflags" am: 1fac7a1259

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

Change-Id: Ic2477ef379632b74878a037532519df61fd07d0f

3 years agoMerge "Remove unneeded cflags and ldflags"
Treehugger Robot [Mon, 21 Sep 2020 21:19:40 +0000 (21:19 +0000)]
Merge "Remove unneeded cflags and ldflags"

3 years agoMerge "HciHalTest: Handle EINTR when reading" am: a5ee51c390 am: 4240d3e2f7
Myles Watson [Mon, 21 Sep 2020 21:05:07 +0000 (21:05 +0000)]
Merge "HciHalTest: Handle EINTR when reading" am: a5ee51c390 am: 4240d3e2f7

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

Change-Id: I6e652cfe63ae4bd4f1fecace30c2902ea666251d

3 years agoHciHalRootCanalTest: Use ASSERT and retry reads
Myles Watson [Sat, 9 May 2020 13:38:57 +0000 (06:38 -0700)]
HciHalRootCanalTest: Use ASSERT and retry reads

Tag: #gd-refactor
Bug: 156148686
Test: atest bluetooth_test_gd
      (while building Android)
Change-Id: I4a69e172eda911e24ecf7482cd88a724139ca29d
Merged-In: I4a69e172eda911e24ecf7482cd88a724139ca29d

3 years agoRemove unused stack/btm/btm_ble_int_types::tINQ_LE_BDADDR
Chris Manton [Fri, 18 Sep 2020 15:44:52 +0000 (08:44 -0700)]
Remove unused stack/btm/btm_ble_int_types::tINQ_LE_BDADDR

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I9c6cce2135abd683ed383e600d9034c5ed52131b

3 years agoRemove constant var tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::scan_duplicate_filter
Chris Manton [Fri, 18 Sep 2020 15:30:17 +0000 (08:30 -0700)]
Remove constant var tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::scan_duplicate_filter

Always set to same value

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I808a6fd2466d7f72f0ab41d2862e3bf64910f718

3 years agoMerge "HciHalTest: Handle EINTR when reading" am: a5ee51c390
Myles Watson [Mon, 21 Sep 2020 20:14:54 +0000 (20:14 +0000)]
Merge "HciHalTest: Handle EINTR when reading" am: a5ee51c390

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

Change-Id: I3f58638f3fa5836e73e090db6344aeabf7c030f1

3 years agoRemove never-set vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::
Chris Manton [Fri, 18 Sep 2020 15:16:40 +0000 (08:16 -0700)]
Remove never-set vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::

tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_interval_min
tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_interval_max

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I263e4cfd19a17affd9838cbaad52abb3fbe4185b

3 years agoAdd Api tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_mode
Chris Manton [Fri, 18 Sep 2020 03:21:42 +0000 (20:21 -0700)]
Add Api tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_mode

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I522fcfa31f36d487777d6b228cbdacd8b3ef9884

3 years agoRemove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB
Chris Manton [Fri, 18 Sep 2020 03:06:35 +0000 (20:06 -0700)]
Remove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB

tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::num_bd_entries
tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::max_bd_entries

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I6abb23191fb4cdfe7a175862e01643b497297afb

3 years agoExpand clever stack/btm/btm_ble_gap::btm_set_conn_mode_adv_init_addr
Chris Manton [Fri, 18 Sep 2020 02:55:21 +0000 (19:55 -0700)]
Expand clever stack/btm/btm_ble_gap::btm_set_conn_mode_adv_init_addr

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: Ibf79e13860f728277f6377db91a4865881b3a048

3 years agoRemove tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::tx_power
Chris Manton [Fri, 18 Sep 2020 02:46:03 +0000 (19:46 -0700)]
Remove tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::tx_power

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I5ba9d8908c249e53976567af258deb0ce8e218d5

3 years agoRemove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB
Chris Manton [Fri, 18 Sep 2020 02:20:54 +0000 (19:20 -0700)]
Remove unused vars tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB

tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB::p
tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB::p_generate_cback
tBTM_CB::tBTM_BLE_CB::tBTM_LE_RANDOM_CB::random_bda

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I8752296aef2348778fca7d9d1fa3dce67017cee2

3 years agoRemove never-set var tBTM_CB::tBTM_BLE_CB::mixed_mode
Chris Manton [Fri, 18 Sep 2020 01:40:06 +0000 (18:40 -0700)]
Remove never-set var tBTM_CB::tBTM_BLE_CB::mixed_mode

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I5cd5b8b10a8480ee8ea8a81de0c75d0f57f6fa53

3 years agoConst-ify size tBTM_CB::tBTM_BLE_CB::link_count[]
Chris Manton [Fri, 18 Sep 2020 01:35:15 +0000 (18:35 -0700)]
Const-ify size tBTM_CB::tBTM_BLE_CB::link_count[]

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I7d4e5e40600fc264fc30f51bb5a7fd1ebca7636d

3 years agoRemove unused var tBTM_CB::tBTM_BLE_CB::enabled
Chris Manton [Fri, 18 Sep 2020 01:25:31 +0000 (18:25 -0700)]
Remove unused var tBTM_CB::tBTM_BLE_CB::enabled

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I135ae450329b381147917d0fe6f6e477dd9582c9

3 years agoAdd Api around tBTM_CB::paging
Chris Manton [Fri, 18 Sep 2020 01:15:13 +0000 (18:15 -0700)]
Add Api around tBTM_CB::paging

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I4428c989124c8b4735162f9e798e96eaee87ce85

3 years agoRemove tBTM_CB::discing can never be true
Chris Manton [Fri, 18 Sep 2020 01:08:20 +0000 (18:08 -0700)]
Remove tBTM_CB::discing can never be true

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I9ab220375763f1bf8959ace85ef1fc02eca81bd5

3 years agoRevert "Remove unused #def and #ifdef stack/include/btm_ble_api_types" am: 22e219611c...
Robin Lee [Mon, 21 Sep 2020 20:08:53 +0000 (20:08 +0000)]
Revert "Remove unused #def and #ifdef stack/include/btm_ble_api_types" am: 22e219611c am: f1c36e2525

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

Change-Id: I97a658febc5b8e997093a380c63c2fbd0c1e4b54