OSDN Git Service

android-x86/system-bt.git
3 years agoMerge "GD: Add LogBluetoothHalCrashReason" am: d51c922278
Weichin Weng [Wed, 28 Apr 2021 02:38:56 +0000 (02:38 +0000)]
Merge "GD: Add LogBluetoothHalCrashReason" am: d51c922278

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

Change-Id: Id53dd4aeeb0a7b8e4b7636597406fe4f07747690

3 years agoMerge "GD: Add LogBluetoothHalCrashReason"
Weichin Weng [Wed, 28 Apr 2021 02:17:35 +0000 (02:17 +0000)]
Merge "GD: Add LogBluetoothHalCrashReason"

3 years agoMerge "HCI: Add SetEventMaskPage2 Opcode" am: b68e9e5c78
Myles Watson [Wed, 28 Apr 2021 01:02:34 +0000 (01:02 +0000)]
Merge "HCI: Add SetEventMaskPage2 Opcode" am: b68e9e5c78

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

Change-Id: I73613e5fc44a5de0b5fd0ba9bf0c6e3c8e08529c

3 years agoMerge "HCI: Add SetEventMaskPage2 Opcode"
Myles Watson [Wed, 28 Apr 2021 00:50:41 +0000 (00:50 +0000)]
Merge "HCI: Add SetEventMaskPage2 Opcode"

3 years agoGD: Add LogBluetoothHalCrashReason
weichinweng [Tue, 27 Apr 2021 02:14:25 +0000 (10:14 +0800)]
GD: Add LogBluetoothHalCrashReason

Add LogBluetoothHalCrashReason function in GD to collect Bluetooth hal
crash reason.

Bug: 174284338
Tag: #feature
Test: atest BluetoothInstrumentationTests
Change-Id: Ibdf4e1acd60f2f13f65c61c69421192ff246850b

3 years agoMerge "shim: Add method to query stack manager for gd dumpsys module start" am: 07051...
Chris Manton [Tue, 27 Apr 2021 21:39:02 +0000 (21:39 +0000)]
Merge "shim: Add method to query stack manager for gd dumpsys module start" am: 070516726e

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

Change-Id: I9b2aa0044911ea92546ad2f28b82a33eed9c8d1a

3 years agoMerge "shim: Add method to query stack manager for gd dumpsys module start"
Chris Manton [Tue, 27 Apr 2021 21:09:52 +0000 (21:09 +0000)]
Merge "shim: Add method to query stack manager for gd dumpsys module start"

3 years agoRe-point main/test/ to use common test/mock am: 3a92009d3b
Chris Manton [Tue, 27 Apr 2021 20:53:18 +0000 (20:53 +0000)]
Re-point main/test/ to use common test/mock am: 3a92009d3b

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

Change-Id: I17e2a478a24d64950104a65b0086dab90d021db3

3 years agoRe-include bta/vc/devices am: 633d92d79e
Chris Manton [Tue, 27 Apr 2021 20:53:16 +0000 (20:53 +0000)]
Re-include bta/vc/devices am: 633d92d79e

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

Change-Id: Ia66e916007fd979d8e859bfeaefcadec8764378b

3 years agoBreak out BTM_LogHistory am: 29b895da4e
Chris Manton [Tue, 27 Apr 2021 20:53:14 +0000 (20:53 +0000)]
Break out BTM_LogHistory am: 29b895da4e

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

Change-Id: I6ddd0c716358779b185777aa59026779cf70521d

3 years agoUse proper types tBTM_BLE_SEC_ACT am: 026b94c40c
Chris Manton [Tue, 27 Apr 2021 20:53:12 +0000 (20:53 +0000)]
Use proper types tBTM_BLE_SEC_ACT am: 026b94c40c

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

Change-Id: Ib3c1483903b9c17bfb26f39b71013ab3b8ec7eb2

3 years agoEnum-ify stack/include/btm/::tBTM_BLE_SEC_ACT am: a82d7f97ce
Chris Manton [Tue, 27 Apr 2021 20:53:10 +0000 (20:53 +0000)]
Enum-ify stack/include/btm/::tBTM_BLE_SEC_ACT am: a82d7f97ce

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

Change-Id: Idcf3ee475ac132cfcd5138798ad36f52659be1e6

3 years agoRemove BLE_DELAY_REQUEST_ENC am: f59ab5c7cf
Zach Johnson [Tue, 27 Apr 2021 20:52:13 +0000 (20:52 +0000)]
Remove BLE_DELAY_REQUEST_ENC am: f59ab5c7cf

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

Change-Id: Ie360f2d695ba61ec9d225730b571733590478db2

3 years agoRe-point main/test/ to use common test/mock
Chris Manton [Tue, 27 Apr 2021 00:12:53 +0000 (17:12 -0700)]
Re-point main/test/ to use common test/mock

Toward testable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: I6f2d7a4a26858c416750bf35c47f70ec13f2f0f4

3 years agoRe-include bta/vc/devices
Chris Manton [Tue, 27 Apr 2021 16:26:42 +0000 (09:26 -0700)]
Re-include bta/vc/devices

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Iae4b30484c2e0a38d5ac61875c1a80c6b04bd97f

3 years agoshim: Add method to query stack manager for gd dumpsys module start
Chris Manton [Tue, 20 Apr 2021 21:55:43 +0000 (14:55 -0700)]
shim: Add method to query stack manager for gd dumpsys module start

Bug: 182544206
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ib9bef0b07b5a2248ae4262537b4fa4a4f865e0e3

3 years agoBreak out BTM_LogHistory
Chris Manton [Mon, 8 Feb 2021 23:57:43 +0000 (15:57 -0800)]
Break out BTM_LogHistory

Toward includable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: Ibbb8d94783f131a0ad4e455b6a3e9e3861be0dfd

3 years agoUse proper types tBTM_BLE_SEC_ACT
Chris Manton [Wed, 27 Jan 2021 17:22:07 +0000 (09:22 -0800)]
Use proper types tBTM_BLE_SEC_ACT

Toward readable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: Iad6f664ff123e5cee858ef4fee9a7356a89df9c9

3 years agoEnum-ify stack/include/btm/::tBTM_BLE_SEC_ACT
Chris Manton [Wed, 27 Jan 2021 17:25:47 +0000 (09:25 -0800)]
Enum-ify stack/include/btm/::tBTM_BLE_SEC_ACT

Toward readable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: I91920ec11dfb0095f271cdda81b7bb1819a68431

3 years agoRemove BLE_DELAY_REQUEST_ENC
Zach Johnson [Fri, 21 Aug 2020 16:51:09 +0000 (09:51 -0700)]
Remove BLE_DELAY_REQUEST_ENC

If it is enabled, the logic makes no sense.

The security flags are stored in 2 bytes.
The upper byte is LE security flags, and the lower byte is classic flags.
It is checking the classic flags to determine whether to start
BLE encryption.

It was false by default.

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

3 years agogd: Add module started query method am: be73ad8daa
Chris Manton [Tue, 27 Apr 2021 02:22:25 +0000 (02:22 +0000)]
gd: Add module started query method am: be73ad8daa

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

Change-Id: I26ff6e1cb4170d2bfd06edd09aaf05315ac76b34

3 years agoHCI: Add SetEventMaskPage2 Opcode
Myles Watson [Mon, 26 Apr 2021 23:59:56 +0000 (16:59 -0700)]
HCI: Add SetEventMaskPage2 Opcode

SetEventMaskPage2 is used for enabling/disabling
events for AMP.  Although we don't support these,
we can support (ignore) the command to disable them.

Bug: 186458975
Test: cert/run
Tag: #gd-refactor
Change-Id: Ibe957895fb830baf93b796a6b375928884912e18

3 years agogd: Add module started query method
Chris Manton [Tue, 20 Apr 2021 21:01:17 +0000 (14:01 -0700)]
gd: Add module started query method

Bug: 182544206
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I7d2dedd4aaa20fd6811166c86d1b9931e6dda536

3 years agoRemove unneeded header file gd/shim/only_..._ever am: 7c321ec80c
Chris Manton [Mon, 26 Apr 2021 22:07:08 +0000 (22:07 +0000)]
Remove unneeded header file gd/shim/only_..._ever am: 7c321ec80c

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

Change-Id: I0d992dbd7f2a865a45bbcb3ff1fe35e5a08326f9

3 years agogd: Use flushable attribute to packets am: 57a1cf77c2
Chris Manton [Mon, 26 Apr 2021 19:24:05 +0000 (19:24 +0000)]
gd: Use flushable attribute to packets am: 57a1cf77c2

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

Change-Id: Ie2b3a2f5589dff2bce4874d50e2ae230b1ceac9a

3 years agogd: Add flushable attribute to packets am: 9e418804ba
Chris Manton [Mon, 26 Apr 2021 19:24:02 +0000 (19:24 +0000)]
gd: Add flushable attribute to packets am: 9e418804ba

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

Change-Id: I8067192b2ddc59e5193d99a9d0593965f5bc03d5

3 years agoIntroduce stack_hci_test am: 8c6b795334
Chris Manton [Mon, 26 Apr 2021 19:23:59 +0000 (19:23 +0000)]
Introduce stack_hci_test am: 8c6b795334

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

Change-Id: Id8d860fb66f9536c10ee6d010f7560046edbd80d

3 years agoUpdate change packet type logic stack/btm/btm_acl am: 37c8bf5e0f
Chris Manton [Mon, 26 Apr 2021 19:23:56 +0000 (19:23 +0000)]
Update change packet type logic stack/btm/btm_acl am: 37c8bf5e0f

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

Change-Id: I6d6d67780238bee313fd11abfe430c6be6af3d09

3 years agoIntroduce stack/acl::PeerPacketTypes am: ede5c7cc8f
Chris Manton [Mon, 26 Apr 2021 19:23:54 +0000 (19:23 +0000)]
Introduce stack/acl::PeerPacketTypes am: ede5c7cc8f

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

Change-Id: Ieaef571a60e27df465bad0f8280eaf870ce390d4

3 years agoAdd test mock filegroup TestMockLegacyHciCommands am: 2e06973dd8
Chris Manton [Mon, 26 Apr 2021 19:23:05 +0000 (19:23 +0000)]
Add test mock filegroup TestMockLegacyHciCommands am: 2e06973dd8

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

Change-Id: I12c061e78bd7fbd0dcda2cc2df4788fa4143d630

3 years agoRemove unneeded header file gd/shim/only_..._ever
Chris Manton [Tue, 20 Apr 2021 20:37:34 +0000 (13:37 -0700)]
Remove unneeded header file gd/shim/only_..._ever

Bug:182544206
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I66382c4160c0da5c8d3f2fbb5101cd90e37be627

3 years agoUse test mocks for device controller am: 040e7eda09
Chris Manton [Sat, 24 Apr 2021 18:04:43 +0000 (18:04 +0000)]
Use test mocks for device controller am: 040e7eda09

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

Change-Id: Ibab6b716d97c79ca758f12cadca7bcd76b3c44c4

3 years agoMerge "Use proper types tBTM_STATUS" am: f499c2b9ba
Chris Manton [Sat, 24 Apr 2021 16:41:08 +0000 (16:41 +0000)]
Merge "Use proper types tBTM_STATUS" am: f499c2b9ba

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

Change-Id: I0d7b4eda51a0094341cf6ff56df945904de8d1e9

3 years agogd: Use flushable attribute to packets
Chris Manton [Fri, 23 Apr 2021 20:33:47 +0000 (13:33 -0700)]
gd: Use flushable attribute to packets

Bug: 178752129
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ie83541faf25a7d8d22877021ff8cc1ff32c110f2

3 years agogd: Add flushable attribute to packets
Chris Manton [Fri, 23 Apr 2021 19:55:07 +0000 (12:55 -0700)]
gd: Add flushable attribute to packets

Bug: 178752129
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I63dcc91f1ddbca9a0a3fadc38807f2a58b8ab2a8

3 years agoIntroduce stack_hci_test
Chris Manton [Fri, 23 Apr 2021 19:54:38 +0000 (12:54 -0700)]
Introduce stack_hci_test

Bug: 178752129
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ib8e78e49a1f4e4f48e811eac0342e9d33eb7ceb4

3 years agoUpdate change packet type logic stack/btm/btm_acl
Chris Manton [Fri, 23 Apr 2021 00:36:38 +0000 (17:36 -0700)]
Update change packet type logic stack/btm/btm_acl

Bug: 182370398
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I6da232bfab73237969811f913b8394e0c9880507

3 years agoIntroduce stack/acl::PeerPacketTypes
Chris Manton [Fri, 23 Apr 2021 00:36:23 +0000 (17:36 -0700)]
Introduce stack/acl::PeerPacketTypes

Bug: 182370398
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I5034f21c30f3e8217b0b6d82e588560e0f5cdd7a

3 years agoAdd test mock filegroup TestMockLegacyHciCommands
Chris Manton [Fri, 23 Apr 2021 00:05:10 +0000 (17:05 -0700)]
Add test mock filegroup TestMockLegacyHciCommands

Bug: 182370398
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I968195c790eced00134739cbb9b6c9c060193d97

3 years agoUse test mocks for device controller
Chris Manton [Thu, 22 Apr 2021 22:19:26 +0000 (15:19 -0700)]
Use test mocks for device controller

Bug: 182370398
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I2caf2baf34307c92d3dba39dabbda65bb4aa0707

3 years agoMerge "Use proper types tBTM_STATUS"
Chris Manton [Sat, 24 Apr 2021 16:24:48 +0000 (16:24 +0000)]
Merge "Use proper types tBTM_STATUS"

3 years agoMerge "Controller: Set host support flag for Secure Connections" am: 7ea2dd5c89
Myles Watson [Sat, 24 Apr 2021 11:35:13 +0000 (11:35 +0000)]
Merge "Controller: Set host support flag for Secure Connections" am: 7ea2dd5c89

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

Change-Id: I14a16b5bb7adfb9620274656147d27e181bcb469

3 years agoMerge "Controller: Set host support flag for Secure Connections"
Myles Watson [Sat, 24 Apr 2021 11:30:06 +0000 (11:30 +0000)]
Merge "Controller: Set host support flag for Secure Connections"

3 years agoRevert "gd_acl: Remove redundant call stack/l2cap/l2c_link" am: 1c8579dfb0
Chris Manton [Sat, 24 Apr 2021 11:24:26 +0000 (11:24 +0000)]
Revert "gd_acl: Remove redundant call stack/l2cap/l2c_link" am: 1c8579dfb0

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

Change-Id: Ib6572303ff8973bd7fd44cfd685884b131d3580d

3 years agoRevert "gd_acl: Remove redundant call stack/l2cap/l2c_link"
Chris Manton [Fri, 23 Apr 2021 23:35:11 +0000 (23:35 +0000)]
Revert "gd_acl: Remove redundant call stack/l2cap/l2c_link"

This reverts commit f1e52ce0390fc817d192263f910fb124b44adc9b.

Reason for revert: Breaks CTKD

Bug: 180137651
Test: gd/cert/run
Tag: #gd-refactor

Change-Id: Ie67838980b69872926239f6511e2ff2efe7167c7

3 years agoUse proper types tBTM_STATUS
Chris Manton [Mon, 1 Mar 2021 18:33:25 +0000 (10:33 -0800)]
Use proper types tBTM_STATUS

Toward readable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: Ie4eb62898e05e9031c5df1e64e94d3935415fed2

3 years agoAdd test mocks for device controller am: a326265e52
Chris Manton [Sat, 24 Apr 2021 05:45:18 +0000 (05:45 +0000)]
Add test mocks for device controller am: a326265e52

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

Change-Id: I74ace02516893dc505aad0b427c1931dff0505f2

3 years agoRemove inaccessible mock functions am: 2a3ab2f31c
Chris Manton [Sat, 24 Apr 2021 05:45:15 +0000 (05:45 +0000)]
Remove inaccessible mock functions am: 2a3ab2f31c

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

Change-Id: Ifbd12c57f6642962223976ef72fb665c7f67bcf7

3 years agoEnum-ify stack/include/hcidefs::tHCI_PKT_TYPE_BITMASK am: 9217c4eb16
Chris Manton [Sat, 24 Apr 2021 05:45:13 +0000 (05:45 +0000)]
Enum-ify stack/include/hcidefs::tHCI_PKT_TYPE_BITMASK am: 9217c4eb16

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

Change-Id: Ic523cab952f870ec1145e7f493b3105492609f16

3 years agoController: Set host support flag for Secure Connections
Myles Watson [Fri, 23 Apr 2021 22:56:24 +0000 (15:56 -0700)]
Controller: Set host support flag for Secure Connections

Bug: 180137651
Tag: #gd-refactor
Test: cert/run
Change-Id: I74eac7315defd955875a0b744a67788c0d9ca97c

3 years agoAdd test mocks for device controller
Chris Manton [Thu, 22 Apr 2021 21:49:12 +0000 (14:49 -0700)]
Add test mocks for device controller

Bug: 182370398
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
No-Typo-Check: Legacy code mocks

Change-Id: I0b3c9f4400db8108156957aaca9e5ab41be043a5

3 years agoRemove inaccessible mock functions
Chris Manton [Thu, 22 Apr 2021 21:47:59 +0000 (14:47 -0700)]
Remove inaccessible mock functions

Bug: 182370398
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I01f3a0e34fe281f9257913d7ef414e40a4e6516c

3 years agoEnum-ify stack/include/hcidefs::tHCI_PKT_TYPE_BITMASK
Chris Manton [Thu, 22 Apr 2021 21:17:44 +0000 (14:17 -0700)]
Enum-ify stack/include/hcidefs::tHCI_PKT_TYPE_BITMASK

Bug: 182370398
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I428a3123847ad60d31709765105b95834c7d7d92

3 years agoMerge "Additional changes for Linux build" am: ed68c8e76b
Abhishek Pandit-Subedi [Fri, 23 Apr 2021 20:52:52 +0000 (20:52 +0000)]
Merge "Additional changes for Linux build" am: ed68c8e76b

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

Change-Id: I6e4d975992b838e8143f68029a7e72b65b6b5754

3 years agoMerge "Additional changes for Linux build"
Abhishek Pandit-Subedi [Fri, 23 Apr 2021 20:21:39 +0000 (20:21 +0000)]
Merge "Additional changes for Linux build"

3 years agoMerge "Add scripts to generate Debian packages of Fluoride dependencies" am: 44f7e2c744
Sonny Sasaka [Fri, 23 Apr 2021 20:00:35 +0000 (20:00 +0000)]
Merge "Add scripts to generate Debian packages of Fluoride dependencies" am: 44f7e2c744

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

Change-Id: I459cef2c76fe1f5bc31dc7649606e364b8d4e9e8

3 years agoMerge "Add scripts to generate Debian packages of Fluoride dependencies"
Sonny Sasaka [Fri, 23 Apr 2021 19:36:01 +0000 (19:36 +0000)]
Merge "Add scripts to generate Debian packages of Fluoride dependencies"

3 years agoAdditional changes for Linux build
Abhishek Pandit-Subedi [Sat, 10 Apr 2021 00:41:07 +0000 (00:41 +0000)]
Additional changes for Linux build

While building for Linux on cloudtop, a few more problems were
identified in the build. There were a couple of missing #include and
some incomplete struct definitions in btm_int_types.h. Also put
statslog.h behind an #ifdef OS_ANDROID.

Bug: 184975659
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: Ic2272a3acfa66259e692db280b48b4ddadff2171

3 years agoMerge "gd test: Enqueue data/command in right order" am: 72244b6ba2
Myles Watson [Fri, 23 Apr 2021 17:46:53 +0000 (17:46 +0000)]
Merge "gd test: Enqueue data/command in right order" am: 72244b6ba2

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

Change-Id: I79aabdf7c2b920d1be562c2ad55f5012eb21fd5f

3 years agoMerge "gd acl: Only ack pause when onPause" am: b413b3bdb5
Myles Watson [Fri, 23 Apr 2021 17:46:05 +0000 (17:46 +0000)]
Merge "gd acl: Only ack pause when onPause" am: b413b3bdb5

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

Change-Id: Ia4e8eec3be6af8f2945affa649c76a9f56a9b5c0

3 years agoGD-Shim: Free BT_HDR after use or callback failure am: 8c6d960f52
Jack He [Fri, 23 Apr 2021 17:44:23 +0000 (17:44 +0000)]
GD-Shim: Free BT_HDR after use or callback failure am: 8c6d960f52

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

Change-Id: Ia5c494b010d3bcab66715fabbf354ceaa4f28105

3 years agoMerge "gd test: Enqueue data/command in right order"
Myles Watson [Fri, 23 Apr 2021 17:34:55 +0000 (17:34 +0000)]
Merge "gd test: Enqueue data/command in right order"

3 years agoMerge "gd acl: Only ack pause when onPause"
Myles Watson [Fri, 23 Apr 2021 17:33:35 +0000 (17:33 +0000)]
Merge "gd acl: Only ack pause when onPause"

3 years agogd test: Enqueue data/command in right order
Chienyuan [Fri, 23 Apr 2021 10:12:44 +0000 (18:12 +0800)]
gd test: Enqueue data/command in right order

Tag: #gd-refactor
Bug: 186071486
Test: gd/cert/run
Test: bluetooth_test_gd
Change-Id: Iec8663e8ae99fb689871e982b85c81a4f093b555

3 years agogd acl: Only ack pause when onPause
Chienyuan [Fri, 23 Apr 2021 07:26:03 +0000 (15:26 +0800)]
gd acl: Only ack pause when onPause

Tag: #gd-refactor
Bug: 186071486
Test: gd/cert/run
Change-Id: I5557312ec21485dea3513977bc893de3d58a50fa

3 years agoGD-Shim: Free BT_HDR after use or callback failure
Jack He [Fri, 23 Apr 2021 07:20:38 +0000 (00:20 -0700)]
GD-Shim: Free BT_HDR after use or callback failure

* Legacy stack always assume the last user of BT_HDR
  will free the structure. Make sure we do this in GD
  shim as well

Bug: 185083624
Tag: #gd-refactor
Test: gd/cert/run

Send a 31MB video
- before this change, RSS increased by 86 MB when 10% (3MB) was sent
- after this change, RSS increased by 37 MB and stabilized, this
  increase is anticipated as the file needs to be cached in RAM

BYPASS_LONG_LINES_REASON: consist with gd format

Change-Id: Ie934e6d4edd7dfc79b4444ce1c13819834f59692

3 years agoMerge "GD metrics: Log remote version info and manufacturer info at connection comple...
Chen Chen [Thu, 22 Apr 2021 19:07:02 +0000 (19:07 +0000)]
Merge "GD metrics: Log remote version info and manufacturer info at connection complete" am: 03ad3c4dfa

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

Change-Id: Iac8cb1a60be22c1cea8308a6b1dc30da9c8dd61b

3 years agoMerge changes Ib883ada4,Ie9d9fb20 am: 187177a86b
Treehugger Robot [Thu, 22 Apr 2021 19:05:17 +0000 (19:05 +0000)]
Merge changes Ib883ada4,Ie9d9fb20 am: 187177a86b

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

Change-Id: Ic63a9087e82c0980b0bfd2e0a5f175d5f5ddc67e

3 years agoMerge "HIDH: Initialize the ctrl_cid after trigger l2cap disconnect" am: 98daa4e13e
Treehugger Robot [Thu, 22 Apr 2021 18:51:51 +0000 (18:51 +0000)]
Merge "HIDH: Initialize the ctrl_cid after trigger l2cap disconnect" am: 98daa4e13e

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

Change-Id: Ie23e3c7ec5ffda70d484b2f7206f5e476d79d489

3 years agoMerge "GD metrics: Log remote version info and manufacturer info at connection complete"
Chen Chen [Thu, 22 Apr 2021 17:55:56 +0000 (17:55 +0000)]
Merge "GD metrics: Log remote version info and manufacturer info at connection complete"

3 years agoMerge changes Ib883ada4,Ie9d9fb20
Treehugger Robot [Thu, 22 Apr 2021 17:39:34 +0000 (17:39 +0000)]
Merge changes Ib883ada4,Ie9d9fb20

* changes:
  GD: Add verbose logging to module start-up code
  GD Controller: Do not register events that are already registered in HCI

3 years agoGD: Add verbose logging to module start-up code
Jack He [Thu, 22 Apr 2021 05:32:57 +0000 (22:32 -0700)]
GD: Add verbose logging to module start-up code

Bug: 184608842
Test: make, start bluetooth
Tag: #gd-refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ib883ada4cd64d2adb37fdb00312ab581d7a4d50a

3 years agoMerge "HIDH: Initialize the ctrl_cid after trigger l2cap disconnect"
Treehugger Robot [Thu, 22 Apr 2021 17:36:35 +0000 (17:36 +0000)]
Merge "HIDH: Initialize the ctrl_cid after trigger l2cap disconnect"

3 years agodumpsys: Properly log classic/le ACL am: 1684e06a2d
Chris Manton [Thu, 22 Apr 2021 06:45:08 +0000 (06:45 +0000)]
dumpsys: Properly log classic/le ACL am: 1684e06a2d

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

Change-Id: Ida619b6fc34fbc83d8bf3e9e253a7b1f97197c1f

3 years agoGD Controller: Do not register events that are already registered in HCI
Jack He [Thu, 22 Apr 2021 04:49:13 +0000 (21:49 -0700)]
GD Controller: Do not register events that are already registered in HCI

Bug: 186069471
Test: make, enable BT, pair headset, listen to music, make calls
Tag: #gd-refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ie9d9fb20f0b442ed5c84edd5ef03e46be2370504

3 years agodumpsys: Properly log classic/le ACL
Chris Manton [Sun, 14 Mar 2021 16:51:53 +0000 (09:51 -0700)]
dumpsys: Properly log classic/le ACL

Toward loggable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I2abfb24cdcd174dc026d75f8d37d53abfa983266

3 years agoMerge changes I32c92511,I1a3d841d,Ibc688eac am: 7085f57ead
Treehugger Robot [Thu, 22 Apr 2021 04:30:12 +0000 (04:30 +0000)]
Merge changes I32c92511,I1a3d841d,Ibc688eac am: 7085f57ead

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

Change-Id: I58189b331ff7fa2c3b2cc48c791dee5287e49092

3 years agoMerge changes I32c92511,I1a3d841d,Ibc688eac
Treehugger Robot [Thu, 22 Apr 2021 04:12:44 +0000 (04:12 +0000)]
Merge changes I32c92511,I1a3d841d,Ibc688eac

* changes:
  legacy: Add HACK to set legacy SM4 from gd_acl
  gd: Re-introduce read remote supported features
  BTM_history: Add dev states to stack hid host profile

3 years agoPolish tBTM_SEC_DEV_REC::ToString am: a11ca353f6
Chris Manton [Thu, 22 Apr 2021 03:55:15 +0000 (03:55 +0000)]
Polish tBTM_SEC_DEV_REC::ToString am: a11ca353f6

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

Change-Id: Ie35d5e06db97edcd45d0053c8229632fc4014840

3 years agoStore remote lmp version in security record am: d1c0313cfd
Chris Manton [Thu, 22 Apr 2021 02:26:16 +0000 (02:26 +0000)]
Store remote lmp version in security record am: d1c0313cfd

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

Change-Id: Ice0a44f1e8e7db11c40c496cf7b9dff586793534

3 years agoPolish tBTM_SEC_DEV_REC::ToString
Chris Manton [Sun, 14 Mar 2021 16:51:37 +0000 (09:51 -0700)]
Polish tBTM_SEC_DEV_REC::ToString

Toward loggable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I1e6e7a2ed45fd61da9b6020b3d09f1135e7c59d3

3 years agolegacy: Add HACK to set legacy SM4 from gd_acl
Chris Manton [Thu, 22 Apr 2021 01:14:35 +0000 (18:14 -0700)]
legacy: Add HACK to set legacy SM4 from gd_acl

Bug: 185967523
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I32c92511fadebf458175a7f8f210c4ec0e0d3c74

3 years agogd: Re-introduce read remote supported features
Chris Manton [Thu, 22 Apr 2021 00:36:09 +0000 (17:36 -0700)]
gd: Re-introduce read remote supported features

This command is very similar to the remote extended
features for page 0 and can cause confusion.  Broke out
into its own code path for clarity

Bug: 185967523
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I1a3d841d811b47c928521ac3422c13c0c69ea975

3 years agoBTM_history: Add dev states to stack hid host profile
Chris Manton [Sat, 17 Apr 2021 18:02:47 +0000 (11:02 -0700)]
BTM_history: Add dev states to stack hid host profile

Toward loggable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ibc688eacf75a8520fdd74dfef41b2794668bbfa4

3 years agoRe-log btif_update_remote_version_property am: 923da51695
Chris Manton [Wed, 21 Apr 2021 23:47:55 +0000 (23:47 +0000)]
Re-log btif_update_remote_version_property am: 923da51695

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

Change-Id: I7ea26e83875e48009a8bf2270f9cff58f54dd85b

3 years agoStore remote lmp version in security record
Chris Manton [Fri, 12 Mar 2021 06:30:46 +0000 (22:30 -0800)]
Store remote lmp version in security record

Toward loggable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I928bcb52c65b5c9a3cbfd67d48a3465b7e14959f

3 years agoRe-log btif_update_remote_version_property
Chris Manton [Fri, 12 Mar 2021 01:57:21 +0000 (17:57 -0800)]
Re-log btif_update_remote_version_property

Toward readable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I1fab5db45be15edaae5a6a68f5661347fe80cf02

3 years agoGD metrics: Log remote version info and manufacturer info at connection complete
Chen Chen [Wed, 21 Apr 2021 00:24:32 +0000 (17:24 -0700)]
GD metrics: Log remote version info and manufacturer info at connection complete

Test: gd/cert/run
Manual test: build and run Bluetooth (connection, pairing, music and phone call)
Bug: 181819141
Tag: #gd-refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I4febd598ea786ffdaeef100e04edd35a72db4b6c

3 years agoRemove mutable param input bta/hh/bta_hh_act am: 89cb12486d
Chris Manton [Wed, 21 Apr 2021 20:08:26 +0000 (20:08 +0000)]
Remove mutable param input bta/hh/bta_hh_act am: 89cb12486d

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

Change-Id: I0bb2448a6ab04f278d9a664cac30876bab0afbc4

3 years agoMerge changes Iac4351a2,Ib8fadd80 am: 1b14f2df06
Treehugger Robot [Wed, 21 Apr 2021 18:35:04 +0000 (18:35 +0000)]
Merge changes Iac4351a2,Ib8fadd80 am: 1b14f2df06

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

Change-Id: Ia8b490c6aa460ca431e0b65052f9f7c35e8ba211

3 years agoRemove mutable param input bta/hh/bta_hh_act
Chris Manton [Wed, 17 Mar 2021 03:05:03 +0000 (20:05 -0700)]
Remove mutable param input bta/hh/bta_hh_act

Please do not modify the parameters

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: I63a2d921aef40f897058a4a826f9732d6f3d72ae

3 years agoMerge changes Iac4351a2,Ib8fadd80
Treehugger Robot [Wed, 21 Apr 2021 18:01:04 +0000 (18:01 +0000)]
Merge changes Iac4351a2,Ib8fadd80

* changes:
  Demote log message to informational LeAddressManagerCallback
  shim: Add sync at completion connection test

3 years agogd hci: Check extended feature supported when read remote feature complete am: cbadf293bd
Chienyuan [Wed, 21 Apr 2021 17:01:55 +0000 (17:01 +0000)]
gd hci: Check extended feature supported when read remote feature complete am: cbadf293bd

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

Change-Id: I6e6cc54019f415056dbfff947d6bb6ce64187c33

3 years agoDemote log message to informational LeAddressManagerCallback
Chris Manton [Fri, 12 Mar 2021 01:56:57 +0000 (17:56 -0800)]
Demote log message to informational LeAddressManagerCallback

It is normal for multiple handlers to invoke upon receipt
of this event.

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Iac4351a21883bf991c43885ae4bab473681ad1cc

3 years agoshim: Add sync at completion connection test
Chris Manton [Mon, 19 Apr 2021 15:29:39 +0000 (08:29 -0700)]
shim: Add sync at completion connection test

Bug: 181991662
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ib8fadd805da65d24be6dc590ecdb0f4978341ffc

3 years agoMerge "gd Scanning: Ignore non-anonymous advertising report with empty address" am...
Treehugger Robot [Wed, 21 Apr 2021 13:43:58 +0000 (13:43 +0000)]
Merge "gd Scanning: Ignore non-anonymous advertising report with empty address" am: ce2a6aa66b

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

Change-Id: If213df1d8634443abf538e385a10347840681062

3 years agogd hci: Check extended feature supported when read remote feature complete
Chienyuan [Wed, 21 Apr 2021 13:37:19 +0000 (21:37 +0800)]
gd hci: Check extended feature supported when read remote feature complete

Tag: #gd-refactor
Bug: 185972929
Test: gd/cert/run
Change-Id: Id8bbb197694e2e68211968c46fe556062a60f31c

3 years agoMerge "gd Scanning: Ignore non-anonymous advertising report with empty address"
Treehugger Robot [Wed, 21 Apr 2021 13:27:21 +0000 (13:27 +0000)]
Merge "gd Scanning: Ignore non-anonymous advertising report with empty address"

3 years agogd Scanning: Ignore non-anonymous advertising report with empty address
Chienyuan [Tue, 20 Apr 2021 11:50:53 +0000 (19:50 +0800)]
gd Scanning: Ignore non-anonymous advertising report with empty address

Tag: #gd-refactor
Bug: 185793671
Test: gd/cert/run
Change-Id: I56d671aa2726db64ae6e34bc8b32bc5461ae3609

3 years agoHIDH: Initialize the ctrl_cid after trigger l2cap disconnect
weichinweng [Wed, 21 Apr 2021 07:42:27 +0000 (15:42 +0800)]
HIDH: Initialize the ctrl_cid after trigger l2cap disconnect

Since the ctrl_cid doesn't initialize, the HIDH sm can't initialize.
Next time, can't correctly trigger connect and handle the ctrl_cid
connect request.

Bug: 184128916
Test: compile && disconnect/reconnect HID device
Tag: #feature
Change-Id: I7bafe8728726d3df1d0bc58c8bc5224260042365