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

(root) / android-x86 / system-bt.git / log

Hansong Zhang [Wed, 23 Sep 2020 22:15:09 +0000 (22:15 +0000)]

HIDD: Move L2cap disconnect logic together am: b69ff0c16c

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

Change-Id: I6336f26c05421d5f65c2ab1f3e457832acb23d0f

commit | commitdiff | tree

Hansong Zhang [Wed, 23 Sep 2020 22:15:05 +0000 (22:15 +0000)]

AVCT: Move L2cap disconnect logic together am: 99a0ebf3ec

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

Change-Id: Iceb598d61504b4a3f56610a4778b3c7b671b5d5f

commit | commitdiff | tree

Hansong Zhang [Wed, 23 Sep 2020 22:15:02 +0000 (22:15 +0000)]

AVCT_BR: Move L2cap disconnect logic together am: 08c437d37c

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

Change-Id: I42815fa56bf56ed8ac73e8a75361124482143c94

commit | commitdiff | tree

Hansong Zhang [Wed, 23 Sep 2020 22:14:58 +0000 (22:14 +0000)]

AVDT: Move L2cap disconnect logic together am: 75b25c50b6

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

Change-Id: I4f4c7d6fa6c667710df429c31dd256af9a78efa2

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Wed, 23 Sep 2020 05:45:27 +0000 (22:45 -0700)]

HIDD: Move L2cap disconnect logic together

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

commit | commitdiff | tree

Hansong Zhang [Wed, 23 Sep 2020 05:32:27 +0000 (22:32 -0700)]

AVCT: Move L2cap disconnect logic together

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

commit | commitdiff | tree

Hansong Zhang [Wed, 23 Sep 2020 05:29:06 +0000 (22:29 -0700)]

AVCT_BR: Move L2cap disconnect logic together

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

commit | commitdiff | tree

Hansong Zhang [Wed, 23 Sep 2020 05:07:03 +0000 (22:07 -0700)]

AVDT: Move L2cap disconnect logic together

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 23 Sep 2020 20:31:05 +0000 (20:31 +0000)]

Merge "NameDB: Actually remove the address from requested addresses"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 23 Sep 2020 03:47:51 +0000 (03:47 +0000)]

Merge "SDP: We always use basic mode"

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 23 Sep 2020 03:03:01 +0000 (03:03 +0000)]

Merge "[fuzzing] Add liblog dependency."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jakub Pawlowski [Tue, 22 Sep 2020 21:08:44 +0000 (21:08 +0000)]

Merge "stack: Periodic advertising scanner implementation"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 22 Sep 2020 19:01:47 +0000 (19:01 +0000)]

Merge "Revert "HciHalTest: Handle EINTR when reading""

commit | commitdiff | tree

Treehugger Robot [Tue, 22 Sep 2020 18:51:25 +0000 (18:51 +0000)]

Merge "GD-HCI: Add verbose logging for Tx and Rx packets"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Mon, 21 Sep 2020 21:19:40 +0000 (21:19 +0000)]

Merge "Remove unneeded cflags and ldflags"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Myles Watson [Mon, 21 Sep 2020 19:50:04 +0000 (19:50 +0000)]

Merge "HciHalTest: Handle EINTR when reading"

commit | commitdiff | tree

Robin Lee [Mon, 21 Sep 2020 19:43:00 +0000 (19:43 +0000)]

Revert "Remove unused #def and #ifdef stack/include/btm_ble_api_types" am: 22e219611c

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

Change-Id: I70a3f193743218388a0f44482b132fa62a5e4c64

commit | commitdiff | tree

Myles Watson [Mon, 21 Sep 2020 17:44:32 +0000 (10:44 -0700)]

HciHalTest: Handle EINTR when reading

Bug: 168760472
Tag: #stability
Test: atest bluetooth_test_gd
Change-Id: I3b2cb84a5a4674ed6018124c3a9c0e90d8cafc7b

commit | commitdiff | tree

Yi Kong [Mon, 21 Sep 2020 17:05:18 +0000 (01:05 +0800)]

Remove unneeded cflags and ldflags

These flags were converted from old build rules. The build succeeds
without these flags.

Test: m checkbuild
Bug: 169004486
Tag: #refactor
Change-Id: I38fb41c4f23d5681b9574bb479cdb0f999dbb6a4

commit | commitdiff | tree

Robin Lee [Mon, 21 Sep 2020 10:16:55 +0000 (10:16 +0000)]

Revert "Remove unused #def and #ifdef stack/include/btm_ble_api_types"

This reverts commit bb15392871b9c72699cfe0becfe061e250ebd837.

Bug: 169035455
Bug: 163134718
Tag: #refactor
Test: atest BluetoothInstrumentationTests
Reason for revert: Breaks devices overriding these fields

Change-Id: Idc73154004bddc0a905911b29c7ddfb868bc7533

commit | commitdiff | tree

Treehugger Robot [Mon, 21 Sep 2020 05:35:22 +0000 (05:35 +0000)]

Merge "Add ext prop value into hash calculation" am: 72ead1c0db

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

Change-Id: If5f5dcef4075a0a310f3c48686888c2d2204e020

commit | commitdiff | tree

Treehugger Robot [Mon, 21 Sep 2020 05:21:48 +0000 (05:21 +0000)]

Merge "Add ext prop value into hash calculation"

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 21:37:11 +0000 (21:37 +0000)]

Restore select #ifdefs stack/include/btm_ble_api_types am: ab7987b336

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

Change-Id: I5599b306191787cf06d655ccf83497f9deb7b012

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 16:53:44 +0000 (09:53 -0700)]

Restore select #ifdefs stack/include/btm_ble_api_types

Certain targets require customization

Bug: 168969295
Tag: #refactor
Test: compile & builds
Change-Id: Icd2949b86a13d53cf5ae45fc1a66ab01618ddfe3

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 00:18:51 +0000 (00:18 +0000)]

enum-ify stack/include/::BT_DEVICE_TYPE_ am: 70bbd91fc8

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

Change-Id: I4dfc30d7369e7f990f214a6752e0b6b47164c45d

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 00:18:47 +0000 (00:18 +0000)]

enum-ify stack/include/btm_ble_api_types::tBTM_BLE_EVT am: 46e5e4c2c2

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

Change-Id: I0da9f0bfd81ccf1c8bc48151d0b8694af037ab7c

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 00:18:43 +0000 (00:18 +0000)]

Use correct typed values BTM_BLE am: 5f4e6cade7

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

Change-Id: I3c551ea922e368a29b608a518b279bfcb6255a8d

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 00:18:39 +0000 (00:18 +0000)]

Properly reset btm_cb.ble_ctr_cb.inq_var.directed_conn am: 91ef9e7ce4

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

Change-Id: I5718e50d2b5fb7c08695333d8ec27e48867a93e1

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 00:18:35 +0000 (00:18 +0000)]

enum-ify BTM_BLE_ events am: d12b086728

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

Change-Id: Ic2fbfe9f15cab73c7561d395dda3722b3cb79e60

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 00:18:31 +0000 (00:18 +0000)]

Remove unused #def and #ifdef stack/include/btm_ble_api_types am: bb15392871

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

Change-Id: I33793def992ab091b1e89c19d11a7a2478a38287

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 00:18:27 +0000 (00:18 +0000)]

Add stack/include/bt_types::DeviceTypeText am: 59726a54fd

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

Change-Id: I8639fb26d5afa200b861f893f4094f52f2b2faeb

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 00:18:23 +0000 (00:18 +0000)]

enum-ify tBTM_BLE_RL_STATE am: 2eb93aa713

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

Change-Id: I63340a7bc0fb1ba990c6688b5a191ec9432daf0e

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 00:18:19 +0000 (00:18 +0000)]

Add accessors for tBTM_CB::tBTM_BLE_CB::wl_state am: 962988c255

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

Change-Id: I156f8cc5d347e30c16ea7592e34c2f8f13885dd4

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 00:17:36 +0000 (00:17 +0000)]

Remove unused #defs stack/btm:: am: fa2f60578b

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

Change-Id: I568ffc6a51e89a9803bf68d6e8d0399a575c3075

commit | commitdiff | tree

Chris Manton [Thu, 17 Sep 2020 21:51:17 +0000 (14:51 -0700)]

enum-ify stack/include/::BT_DEVICE_TYPE_

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I58b0524279c97c98db08d299b41d6d9bf3fe7a83

system/bt

RSS Atom

About OSDN

Find Software

Develop Software

Help