OSDN Git Service

android-x86/system-bt.git
3 years agoMerge "A2DP offload: modify the A2DP offload SCMS-T_Enable with SCMS-T header" am...
Treehugger Robot [Mon, 26 Oct 2020 23:42:41 +0000 (23:42 +0000)]
Merge "A2DP offload: modify the A2DP offload SCMS-T_Enable with SCMS-T header" am: 0b3cb3c353 am: 74ca4f10de

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

Change-Id: I82f1b5827b28b42d1b25a2fd4e2c776744898d29

3 years agoMerge "A2DP offload: modify the A2DP offload SCMS-T_Enable with SCMS-T header" am...
Treehugger Robot [Mon, 26 Oct 2020 23:25:40 +0000 (23:25 +0000)]
Merge "A2DP offload: modify the A2DP offload SCMS-T_Enable with SCMS-T header" am: 0b3cb3c353

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

Change-Id: I719322abab346e7e9e82be6139e16b7e7e13a7e8

3 years agoMerge "A2DP offload: modify the A2DP offload SCMS-T_Enable with SCMS-T header"
Treehugger Robot [Mon, 26 Oct 2020 23:13:26 +0000 (23:13 +0000)]
Merge "A2DP offload: modify the A2DP offload SCMS-T_Enable with SCMS-T header"

3 years agoRe-log stack/btm/btm_ble::btm_ble_start_sec_check am: 30abace52c am: 875ce95507
Chris Manton [Mon, 26 Oct 2020 22:06:52 +0000 (22:06 +0000)]
Re-log stack/btm/btm_ble::btm_ble_start_sec_check am: 30abace52c am: 875ce95507

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

Change-Id: I14776202eee5b5a00a1963479983a8fbbfb2fbf8

3 years agoRe-log stack/l2cap/l2c_ble::l2ble_sec_access_req am: 2db5d150ee am: a36328539d
Chris Manton [Mon, 26 Oct 2020 22:06:50 +0000 (22:06 +0000)]
Re-log  stack/l2cap/l2c_ble::l2ble_sec_access_req am: 2db5d150ee am: a36328539d

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

Change-Id: I28ac830ebda1964a2fa5edd636feffe0b9268398

3 years agoRe-log stack/btm/btm_ble::btm_ble_start_sec_check am: 30abace52c
Chris Manton [Mon, 26 Oct 2020 21:50:35 +0000 (21:50 +0000)]
Re-log stack/btm/btm_ble::btm_ble_start_sec_check am: 30abace52c

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

Change-Id: I18733bde17152ef1fa32987f5a8b3b3901169818

3 years agoRe-log stack/l2cap/l2c_ble::l2ble_sec_access_req am: 2db5d150ee
Chris Manton [Mon, 26 Oct 2020 21:50:02 +0000 (21:50 +0000)]
Re-log  stack/l2cap/l2c_ble::l2ble_sec_access_req am: 2db5d150ee

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

Change-Id: I8ebc05fadefd0618973df1add828511be5b38c76

3 years agobtm_acl_removed: Check for null as acl may have already closed am: fedc86ac10 am...
Chris Manton [Mon, 26 Oct 2020 18:05:59 +0000 (18:05 +0000)]
btm_acl_removed: Check for null as acl may have already closed am: fedc86ac10 am: ceac65ddd1

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

Change-Id: I65b0d0eac23af259625385953e767dd93333e07e

3 years agobtm_acl_removed: Check for null as acl may have already closed am: fedc86ac10
Chris Manton [Mon, 26 Oct 2020 17:54:46 +0000 (17:54 +0000)]
btm_acl_removed: Check for null as acl may have already closed am: fedc86ac10

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

Change-Id: Ie35b346942e0cf5dd1ba4bdaea97c0ef649cb776

3 years agoRe-log stack/btm/btm_ble::btm_ble_start_sec_check
Chris Manton [Mon, 26 Oct 2020 16:17:17 +0000 (09:17 -0700)]
Re-log stack/btm/btm_ble::btm_ble_start_sec_check

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I083d8a4af4af47b9a78f61d4618342abb76acbec

3 years agoRe-log stack/l2cap/l2c_ble::l2ble_sec_access_req
Chris Manton [Mon, 26 Oct 2020 16:17:29 +0000 (09:17 -0700)]
Re-log  stack/l2cap/l2c_ble::l2ble_sec_access_req

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I520a8ce93f1192960425291ed905c9bf3aa1cc26

3 years agobtm_acl_removed: Check for null as acl may have already closed
Chris Manton [Mon, 26 Oct 2020 16:16:50 +0000 (09:16 -0700)]
btm_acl_removed: Check for null as acl may have already closed

Bug:159815595
Tag: #refactor
Test: acts.py BleCocTest

Change-Id: I7a5312d4d929280de73442885100714264cd1457

3 years agoMerge "Properly reset tL2C_CCB::ecoc" am: e95eb34646 am: 13eaeec2fe
Treehugger Robot [Mon, 26 Oct 2020 01:01:03 +0000 (01:01 +0000)]
Merge "Properly reset tL2C_CCB::ecoc" am: e95eb34646 am: 13eaeec2fe

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

Change-Id: I6df15699b20b688583fca8c3960ecca7d7c7fda0

3 years agoMerge "Properly reset tL2C_CCB::ecoc" am: e95eb34646
Treehugger Robot [Mon, 26 Oct 2020 00:55:14 +0000 (00:55 +0000)]
Merge "Properly reset tL2C_CCB::ecoc" am: e95eb34646

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

Change-Id: I4b1d9b3315333677e1e881f89395cbb379a1f0a4

3 years agoMerge "Properly reset tL2C_CCB::ecoc"
Treehugger Robot [Mon, 26 Oct 2020 00:30:15 +0000 (00:30 +0000)]
Merge "Properly reset tL2C_CCB::ecoc"

3 years agoACL: Refactor remote version/feature response am: 63ecb78b44 am: 0ab7f1505b
Hansong Zhang [Sun, 25 Oct 2020 23:44:37 +0000 (23:44 +0000)]
ACL: Refactor remote version/feature response am: 63ecb78b44 am: 0ab7f1505b

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

Change-Id: I3a7b0e6fe83d66a564fcade29c1790c729b7ef6d

3 years agoACL: Refactor remote version/feature response am: 63ecb78b44
Hansong Zhang [Sun, 25 Oct 2020 23:34:01 +0000 (23:34 +0000)]
ACL: Refactor remote version/feature response am: 63ecb78b44

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

Change-Id: I6e06a054531172c502b212d7c182c22582585076

3 years agoGD L2cap: Pass more link callbacks to Security am: 9ee148a8b0 am: 80e74de61e
Hansong Zhang [Sun, 25 Oct 2020 21:36:03 +0000 (21:36 +0000)]
GD L2cap: Pass more link callbacks to Security am: 9ee148a8b0 am: 80e74de61e

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

Change-Id: Id5f9bb435acafe23986a53a32a15be3ccbe4d3f9

3 years agogd: Pull out READ_REMOTE_VERSION shared between classic and le am: 18a81f2774 am...
Chris Manton [Sun, 25 Oct 2020 21:35:49 +0000 (21:35 +0000)]
gd: Pull out READ_REMOTE_VERSION shared between classic and le am: 18a81f2774 am: 3805013f00

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

Change-Id: I2c242a9b08acdf5ad85b7e82c405c6d4978f5189

3 years agoGD L2cap: Pass more link callbacks to Security am: 9ee148a8b0
Hansong Zhang [Sun, 25 Oct 2020 21:10:25 +0000 (21:10 +0000)]
GD L2cap: Pass more link callbacks to Security am: 9ee148a8b0

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

Change-Id: I24722ec76612dcbc49e20f5fe102a5eb79f2abbb

3 years agogd: Pull out READ_REMOTE_VERSION shared between classic and le am: 18a81f2774
Chris Manton [Sun, 25 Oct 2020 21:09:54 +0000 (21:09 +0000)]
gd: Pull out READ_REMOTE_VERSION shared between classic and le am: 18a81f2774

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

Change-Id: Ib6f3caaf7cc212382b2017a46798d8e2c9c52d10

3 years agoACL: Refactor remote version/feature response
Hansong Zhang [Sat, 24 Oct 2020 20:46:56 +0000 (13:46 -0700)]
ACL: Refactor remote version/feature response

Separate the packet parsing and handling part, so that we can parse the
packet in GD L2cap and handle it in legacy stack.
When GD L2cap is enabled, don't send these request in legacy stack.

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: I8be299f1e61cb790ce0d0b7a81d3e6a99bc8d336

3 years agoGD L2cap: Pass more link callbacks to Security
Hansong Zhang [Fri, 23 Oct 2020 23:31:17 +0000 (16:31 -0700)]
GD L2cap: Pass more link callbacks to Security

Send Remote version request and supported feature request upon link
connection.
Security might be interested in LMP version and features, and ACL handle
(for legacy).

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: I8c2f373cbdc2850a26c424fb370a041f4e183555

3 years agoProperly reset tL2C_CCB::ecoc
Chris Manton [Sun, 25 Oct 2020 20:25:18 +0000 (13:25 -0700)]
Properly reset tL2C_CCB::ecoc

Bug: 171657571
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I491a7cba9b28dcc4d02d7de4463a3512e8fce719

3 years agogd: Pull out READ_REMOTE_VERSION shared between classic and le
Chris Manton [Sat, 24 Oct 2020 21:09:07 +0000 (14:09 -0700)]
gd: Pull out READ_REMOTE_VERSION shared between classic and le

Test: atest --host bluetooth_test_gd
Test: acts.py BleCocTest ## With gd_hci=false
Test: acts.py BleCocTest ## With gd_acl=true
Bug: 171634583
Tag: #refactor

Change-Id: I53a49fec950755c13e4786be9aae936c0c2b242a

3 years agoOnly send ReadRemoteVersionRequest in legacy mode am: 90b5964bb0 am: 70943d57e8
Chris Manton [Sun, 25 Oct 2020 04:39:41 +0000 (04:39 +0000)]
Only send ReadRemoteVersionRequest in legacy mode am: 90b5964bb0 am: 70943d57e8

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

Change-Id: I51be839d426c3e757437f804e9df538ab6e1c0df

3 years agoOnly send ReadRemoteVersionRequest in legacy mode am: 90b5964bb0
Chris Manton [Sun, 25 Oct 2020 04:25:12 +0000 (04:25 +0000)]
Only send ReadRemoteVersionRequest in legacy mode am: 90b5964bb0

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

Change-Id: I58761ce4ea5cfb6ca0fded6581c34da95616a6ce

3 years agoRevert "Should not send classic commands on le link" am: 4e2fbc54f3 am: 2b3c2e9c9a
Chris Manton [Sun, 25 Oct 2020 00:30:20 +0000 (00:30 +0000)]
Revert "Should not send classic commands on le link" am: 4e2fbc54f3 am: 2b3c2e9c9a

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

Change-Id: Ibc99415be1faf99407c11c2e62a2fe3ac482cf96

3 years agoRevert "Should not send classic commands on le link" am: 4e2fbc54f3
Chris Manton [Sun, 25 Oct 2020 00:20:04 +0000 (00:20 +0000)]
Revert "Should not send classic commands on le link" am: 4e2fbc54f3

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

Change-Id: I44236f77e7191eabb1e83bb7414eac311c815e95

3 years agoOnly send ReadRemoteVersionRequest in legacy mode
Chris Manton [Sat, 24 Oct 2020 21:43:31 +0000 (14:43 -0700)]
Only send ReadRemoteVersionRequest in legacy mode

gd acl can only accept an event for either classic
or le, but not both.

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I719f09a380e7b75da7c40ffc136038ccaea90812

3 years agoRevert "Should not send classic commands on le link"
Chris Manton [Sat, 24 Oct 2020 21:22:03 +0000 (14:22 -0700)]
Revert "Should not send classic commands on le link"

This reverts commit 25b8b04caa3c2c4b218f8d56f5f72e7ca1e24f8c.

Turns out this is a command that may be run on both le and br_edr links

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ieb3de7c6046f18b30805b7486441039b591f929b

3 years agoGD ACL: on_read_remote_supported_features_complete am: 9b14973622 am: f4b7770a2f
Hansong Zhang [Sat, 24 Oct 2020 02:59:24 +0000 (02:59 +0000)]
GD ACL: on_read_remote_supported_features_complete am: 9b14973622 am: f4b7770a2f

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

Change-Id: Ib2e61bd3033e683570d80a0133294707381311d3

3 years agoMerge "Cleanup references to system/core/base -> system/libbase" am: 4c901673d3 am...
Baligh Uddin [Sat, 24 Oct 2020 02:58:50 +0000 (02:58 +0000)]
Merge "Cleanup references to system/core/base -> system/libbase" am: 4c901673d3 am: 74e3c6ca35

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

Change-Id: Id6f86fea1f7dfdc274559aeb4d27264153edb07d

3 years agoGD ACL: on_read_remote_supported_features_complete am: 9b14973622
Hansong Zhang [Sat, 24 Oct 2020 02:28:00 +0000 (02:28 +0000)]
GD ACL: on_read_remote_supported_features_complete am: 9b14973622

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

Change-Id: Ia465ab88b6ee1bdb1fa2405f106f2260846ec527

3 years agoGD ACL: on_read_remote_supported_features_complete
Hansong Zhang [Fri, 23 Oct 2020 23:27:18 +0000 (16:27 -0700)]
GD ACL: on_read_remote_supported_features_complete

Use OnReadRemoteExtendedFeaturesComplete callback to send it to L2cap

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: I04398f308028c1419072e87a6990aab6f6be1795

3 years agoMerge "Cleanup references to system/core/base -> system/libbase" am: 4c901673d3
Baligh Uddin [Sat, 24 Oct 2020 02:04:48 +0000 (02:04 +0000)]
Merge "Cleanup references to system/core/base -> system/libbase" am: 4c901673d3

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

Change-Id: Ic3f0c1a72549cf3f9e83ff7b2683adf4399b2b67

3 years agoMerge "Cleanup references to system/core/base -> system/libbase"
Baligh Uddin [Sat, 24 Oct 2020 01:40:47 +0000 (01:40 +0000)]
Merge "Cleanup references to system/core/base -> system/libbase"

3 years agoClean up log spam in avrcp and a2dp am: ae14ff3764 am: dcc14565ad
Hansong Zhang [Fri, 23 Oct 2020 22:19:29 +0000 (22:19 +0000)]
Clean up log spam in avrcp and a2dp am: ae14ff3764 am: dcc14565ad

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

Change-Id: I78f7b3a1fcc3463cd39da09a30f17e81421d83b7

3 years agoClean up log spam in avrcp and a2dp am: ae14ff3764
Hansong Zhang [Fri, 23 Oct 2020 22:05:56 +0000 (22:05 +0000)]
Clean up log spam in avrcp and a2dp am: ae14ff3764

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

Change-Id: I08a44275b4269d542e396685ff4e415226b6d26a

3 years agoMerge changes Ic1411faf,I0ef22f28,I645b787d,Ief031db6,I5c494deb, ... am: f8683222cb...
Treehugger Robot [Fri, 23 Oct 2020 21:01:20 +0000 (21:01 +0000)]
Merge changes Ic1411faf,I0ef22f28,I645b787d,Ief031db6,I5c494deb, ... am: f8683222cb am: 8fd68f4f26

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

Change-Id: Ifef17a921aa0363c65d4fefc1b4e26a0b3ad7113

3 years agoMerge changes Ic1411faf,I0ef22f28,I645b787d,Ief031db6,I5c494deb, ... am: f8683222cb
Treehugger Robot [Fri, 23 Oct 2020 20:23:01 +0000 (20:23 +0000)]
Merge changes Ic1411faf,I0ef22f28,I645b787d,Ief031db6,I5c494deb, ... am: f8683222cb

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

Change-Id: Ide2354d20c31492461ad59fc9f833efab2ce6691

3 years agoClean up log spam in avrcp and a2dp
Hansong Zhang [Fri, 23 Oct 2020 19:31:12 +0000 (12:31 -0700)]
Clean up log spam in avrcp and a2dp

Now we don't see bugs in avrcp and a2dp sbc encoder often, move them to
verbose logging.

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

3 years agoMerge changes Ic1411faf,I0ef22f28,I645b787d,Ief031db6,I5c494deb, ...
Treehugger Robot [Fri, 23 Oct 2020 18:55:21 +0000 (18:55 +0000)]
Merge changes Ic1411faf,I0ef22f28,I645b787d,Ief031db6,I5c494deb, ...

* changes:
  Remove unused def SMP_DEBUG
  Remove name from BTM_SecAddBleDevice
  Re-log stack/l2cap/l2c_ble::
  enum-ify link stack/acl/btm_acl::policy settings
  Streamline main/shim/acl::_reason
  Streamline stack/btm/btm_ble_addr::btm_ble_addr_resolvable
  Streamline stack/btm/btm_ble_gap::btm_ble_update_adv_flag
  Streamline stack/btm/btm_ble_addr::btm_ble_resolve_random_addr
  enum-ify stack/btm/btm_ble_gap::BTM_BLE_
  Add main/shim/acl_legacy_interface::auth_complete

3 years agoRevert "BTM_ACL: Remove unused code" am: aae7b9eb1d am: 6548073815
Jakub Pawlowski [Fri, 23 Oct 2020 16:10:57 +0000 (16:10 +0000)]
Revert "BTM_ACL: Remove unused code" am: aae7b9eb1d am: 6548073815

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

Change-Id: I8199d1203684ee4b75bae71318427ebb7a24b373

3 years agoRevert "BTM_ACL: Remove unused code" am: aae7b9eb1d
Jakub Pawlowski [Fri, 23 Oct 2020 15:22:56 +0000 (15:22 +0000)]
Revert "BTM_ACL: Remove unused code" am: aae7b9eb1d

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

Change-Id: I16b2711446eb1327e9ad04a48bd8256ccb1d178f

3 years agoRemove unused def SMP_DEBUG
Chris Manton [Sun, 11 Oct 2020 21:36:53 +0000 (14:36 -0700)]
Remove unused def SMP_DEBUG

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: Ic1411faf31fd6c4dc66282bfe42a0ec47c969bb1

3 years agoRemove name from BTM_SecAddBleDevice
Chris Manton [Fri, 23 Oct 2020 02:47:49 +0000 (19:47 -0700)]
Remove name from BTM_SecAddBleDevice

bd_name is always nullptr

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I0ef22f288425dad0cc08d4e43acc12e5dd51d6dd

3 years agoRe-log stack/l2cap/l2c_ble::
Chris Manton [Thu, 8 Oct 2020 21:25:38 +0000 (14:25 -0700)]
Re-log stack/l2cap/l2c_ble::

Please "don\'t" use apostrophes

Towards grepable code

Bug: 163134718
Tag: #refactor
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I645b787dffa54d1f1829fca1212a4fa811e1f51e

3 years agoenum-ify link stack/acl/btm_acl::policy settings
Chris Manton [Sun, 11 Oct 2020 03:55:47 +0000 (20:55 -0700)]
enum-ify link stack/acl/btm_acl::policy settings

And also move to only use location
And restrict from header into compilation unit

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: Ief031db624bf1363ee3ec4043efafcfdc4be1b59

3 years agoStreamline main/shim/acl::_reason
Chris Manton [Tue, 20 Oct 2020 15:06:13 +0000 (08:06 -0700)]
Streamline main/shim/acl::_reason

Bug: 166280067
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I5c494deb85fbb3101602078dcaeefc98ac695754

3 years agoStreamline stack/btm/btm_ble_addr::btm_ble_addr_resolvable
Chris Manton [Tue, 13 Oct 2020 20:58:56 +0000 (13:58 -0700)]
Streamline stack/btm/btm_ble_addr::btm_ble_addr_resolvable

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I6600ac7d3fdc1a9ff099b0ffa8c9b1826c6db456

3 years agoStreamline stack/btm/btm_ble_gap::btm_ble_update_adv_flag
Chris Manton [Tue, 13 Oct 2020 21:19:35 +0000 (14:19 -0700)]
Streamline stack/btm/btm_ble_gap::btm_ble_update_adv_flag

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I241cf791f672d0003419c7e8e26b4baf2089d681

3 years agoStreamline stack/btm/btm_ble_addr::btm_ble_resolve_random_addr
Chris Manton [Tue, 13 Oct 2020 20:34:43 +0000 (13:34 -0700)]
Streamline stack/btm/btm_ble_addr::btm_ble_resolve_random_addr

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: Ifc5c988e6a5dd8540c5465639022a355ee9efcbf

3 years agoenum-ify stack/btm/btm_ble_gap::BTM_BLE_
Chris Manton [Tue, 13 Oct 2020 21:19:08 +0000 (14:19 -0700)]
enum-ify stack/btm/btm_ble_gap::BTM_BLE_

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: Icb54b5f68c11bcb0a28b1cf25abcaf68c734d6ca

3 years agoAdd main/shim/acl_legacy_interface::auth_complete
Chris Manton [Fri, 16 Oct 2020 01:16:57 +0000 (18:16 -0700)]
Add main/shim/acl_legacy_interface::auth_complete

Bug: 166280067
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I2ad8753860ec78441a22c7f3e071beb11b9773c6

3 years agoCleanup references to system/core/base -> system/libbase
Baligh Uddin [Fri, 23 Oct 2020 14:33:47 +0000 (14:33 +0000)]
Cleanup references to system/core/base -> system/libbase

BUG: 157656545
Test: TH
Change-Id: I6b04e7340d58215ccf183e4b086023281e0a9951

3 years agoA2DP offload: modify the A2DP offload SCMS-T_Enable with SCMS-T header
Alice Kuo [Wed, 14 Oct 2020 10:31:54 +0000 (18:31 +0800)]
A2DP offload: modify the A2DP offload SCMS-T_Enable with SCMS-T header

Follow the Android HCI requirement for the 'Start A2DP Offload' cmd, it
should bring the SCMS-T header in the 'SCMS-T Enable' field as SCMS-T is
enabled. Get the SCMS-T active status of the peer devices as building
the offload start req cmd, and fill the SCMS-T header based the active
status.

Bug: 170785181
Tag: #feature
Test: connect with Sony WH-1000XM4, check the SCMS-T_Enable correctness
Test: atest --test-mapping system/bt
Change-Id: I6003b50a09f010942b37436497b06e06180b2069

3 years agoRevert "BTM_ACL: Remove unused code"
Jakub Pawlowski [Fri, 23 Oct 2020 11:14:14 +0000 (11:14 +0000)]
Revert "BTM_ACL: Remove unused code"

This reverts commit 85a4ce1ebd16bb20e87edac88ba0cbd71fa92d46.

Reason for revert: This is needed for LE Audio

Change-Id: Iaed065aef5f40e066d08004699c07dea2f48c94a

3 years agoMerge changes from topic "gd_security_shim" am: b39c2d25d6 am: d8e22f347b
Treehugger Robot [Fri, 23 Oct 2020 08:01:14 +0000 (08:01 +0000)]
Merge changes from topic "gd_security_shim" am: b39c2d25d6 am: d8e22f347b

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

Change-Id: I26709a0203f1ffd2327d1740fd4ea868a4e0a66a

3 years agoMerge changes from topic "gd_security_shim" am: b39c2d25d6
Treehugger Robot [Fri, 23 Oct 2020 07:48:38 +0000 (07:48 +0000)]
Merge changes from topic "gd_security_shim" am: b39c2d25d6

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

Change-Id: I74fca34c7e6f243e63cb9739e346d7a6427c679b

3 years agoMerge changes from topic "gd_security_shim"
Treehugger Robot [Fri, 23 Oct 2020 07:04:14 +0000 (07:04 +0000)]
Merge changes from topic "gd_security_shim"

* changes:
  GD Security: pipe in determined just_works flag
  GD Security Shim: Make ConfirmationData have strict types

3 years agoRefactor btm_remove_acl am: 309847123f am: 38402e9d30
Hansong Zhang [Fri, 23 Oct 2020 04:30:05 +0000 (04:30 +0000)]
Refactor btm_remove_acl am: 309847123f am: 38402e9d30

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

Change-Id: Icdab0598479288939cc909fbbe8ab40771e982d1

3 years agoBTM_BLE_GAP: Clean up log spam am: de09caf12b am: 4fb23221c0
Hansong Zhang [Fri, 23 Oct 2020 04:30:02 +0000 (04:30 +0000)]
BTM_BLE_GAP: Clean up log spam am: de09caf12b am: 4fb23221c0

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

Change-Id: Ib2eb1a6c4fe4209bbfab9451db30693dc8e7bd77

3 years ago[automerger skipped] Check a2dp packet length is zero am: 1e7e2e2f3f -s ours am:...
Chris Manton [Fri, 23 Oct 2020 03:55:12 +0000 (03:55 +0000)]
[automerger skipped] Check a2dp packet length is zero am: 1e7e2e2f3f -s ours am: 2cbcd49680 -s ours am: 7190217567 -s ours

am skip reason: Change-Id I105b445293c02cb4f37c759fd5b05758fd4e3646 with SHA-1 d61cf5fe04 is in history

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

Change-Id: I63b17bfc7bfb932abe26cea38fe5d7858208ab6a

3 years agoRefactor btm_remove_acl am: 309847123f
Hansong Zhang [Fri, 23 Oct 2020 03:53:42 +0000 (03:53 +0000)]
Refactor btm_remove_acl am: 309847123f

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

Change-Id: I9563f7f801fcdc16fa85eb1f576ff484dcc298f9

3 years agoBTM_BLE_GAP: Clean up log spam am: de09caf12b
Hansong Zhang [Fri, 23 Oct 2020 03:53:02 +0000 (03:53 +0000)]
BTM_BLE_GAP: Clean up log spam am: de09caf12b

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

Change-Id: Iae8f6544d7c61d0cc1c65b5aa7da613a13d0bdc9

3 years ago[automerger skipped] Check a2dp packet length is zero am: 1e7e2e2f3f -s ours am:...
Chris Manton [Fri, 23 Oct 2020 03:43:23 +0000 (03:43 +0000)]
[automerger skipped] Check a2dp packet length is zero am: 1e7e2e2f3f -s ours am: 2cbcd49680 -s ours

am skip reason: Change-Id I105b445293c02cb4f37c759fd5b05758fd4e3646 with SHA-1 d61cf5fe04 is in history

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

Change-Id: I5cf1dc557951040d2b85959a50a180817ecfb9f7

3 years ago[automerger skipped] Check a2dp packet length is zero am: 1e7e2e2f3f -s ours
Chris Manton [Thu, 22 Oct 2020 23:28:07 +0000 (23:28 +0000)]
[automerger skipped] Check a2dp packet length is zero am: 1e7e2e2f3f -s ours

am skip reason: Change-Id I105b445293c02cb4f37c759fd5b05758fd4e3646 with SHA-1 d61cf5fe04 is in history

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

Change-Id: Iee3994fd52bf4736845b8c0501ae70074a095d01

3 years agoRefactor btm_remove_acl
Hansong Zhang [Thu, 22 Oct 2020 20:17:35 +0000 (13:17 -0700)]
Refactor btm_remove_acl

Use ACL handle instead.

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

3 years agoBTM_BLE_GAP: Clean up log spam
Hansong Zhang [Thu, 22 Oct 2020 22:45:50 +0000 (15:45 -0700)]
BTM_BLE_GAP: Clean up log spam

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

3 years agoUse stack/acl/btm_acl::acl_process_extended_features am: 9d80c3fa74 am: 863802a184
Chris Manton [Thu, 22 Oct 2020 23:21:33 +0000 (23:21 +0000)]
Use stack/acl/btm_acl::acl_process_extended_features am: 9d80c3fa74 am: 863802a184

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

Change-Id: I8f161f5aee8d5b8f2281ab7892aa951f5464623d

3 years agoAdd stack/acl/btm_acl::acl_process_extended_features am: ee487ce726 am: bd0dd7c700
Chris Manton [Thu, 22 Oct 2020 23:21:31 +0000 (23:21 +0000)]
Add stack/acl/btm_acl::acl_process_extended_features am: ee487ce726 am: bd0dd7c700

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

Change-Id: I1207cb20179abcf9d67deb18e29df51f081d523c

3 years agoAdd main/shim/acl_legacy_interface::btm_acl_role_changed am: 77a9259dbb am: bb865ef9b6
Chris Manton [Thu, 22 Oct 2020 23:21:29 +0000 (23:21 +0000)]
Add main/shim/acl_legacy_interface::btm_acl_role_changed am: 77a9259dbb am: bb865ef9b6

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

Change-Id: Ib6acaa1ce72814a316b6fa468853f9af1b335e88

3 years agoAdd tHCI_STATUS to btm_acl_role_changed am: 1c9237a289 am: d2f7fbb4db
Chris Manton [Thu, 22 Oct 2020 23:21:27 +0000 (23:21 +0000)]
Add tHCI_STATUS to btm_acl_role_changed am: 1c9237a289 am: d2f7fbb4db

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

Change-Id: Id4eae1f9ff6a53382b71f16d8b0ac78deb1cb5ed

3 years agoShould not send classic commands on le link am: 25b8b04caa am: 16ddca17ea
Chris Manton [Thu, 22 Oct 2020 23:21:25 +0000 (23:21 +0000)]
Should not send classic commands on le link am: 25b8b04caa am: 16ddca17ea

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

Change-Id: Icff09fa15ee2fdc2fd176a8e7c80b8c81e88212b

3 years agoReturn after gd acl creates connection am: 175ea68186 am: 70bafc101e
Chris Manton [Thu, 22 Oct 2020 23:21:23 +0000 (23:21 +0000)]
Return after gd acl creates connection am: 175ea68186 am: 70bafc101e

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

Change-Id: Ie62f1512cca7481cb33492922745ac96879da49e

3 years agoCheck a2dp packet length is zero
Chris Manton [Tue, 10 Mar 2020 15:59:02 +0000 (08:59 -0700)]
Check a2dp packet length is zero

Bug: 142546668
Bug: 168254957
Test: net_test_stack_a2dp_native

Change-Id: I105b445293c02cb4f37c759fd5b05758fd4e3646
Merged-In: I105b445293c02cb4f37c759fd5b05758fd4e3646

3 years agoUse stack/acl/btm_acl::acl_process_extended_features am: 9d80c3fa74
Chris Manton [Thu, 22 Oct 2020 22:51:09 +0000 (22:51 +0000)]
Use stack/acl/btm_acl::acl_process_extended_features am: 9d80c3fa74

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

Change-Id: Ia2e01820ae1be0ede09c3cda579d6179c534bd02

3 years agoAdd stack/acl/btm_acl::acl_process_extended_features am: ee487ce726
Chris Manton [Thu, 22 Oct 2020 22:51:05 +0000 (22:51 +0000)]
Add stack/acl/btm_acl::acl_process_extended_features am: ee487ce726

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

Change-Id: Ie017bda4820042152b7dba13b127032232dc7c77

3 years agoAdd main/shim/acl_legacy_interface::btm_acl_role_changed am: 77a9259dbb
Chris Manton [Thu, 22 Oct 2020 22:51:01 +0000 (22:51 +0000)]
Add main/shim/acl_legacy_interface::btm_acl_role_changed am: 77a9259dbb

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

Change-Id: Ife29ea667cdcac1bf60d4b159b65876e9c217587

3 years agoAdd tHCI_STATUS to btm_acl_role_changed am: 1c9237a289
Chris Manton [Thu, 22 Oct 2020 22:50:57 +0000 (22:50 +0000)]
Add tHCI_STATUS to btm_acl_role_changed am: 1c9237a289

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

Change-Id: Ifad9f10ca3ff62a5a08b0b90499b44a074a6802d

3 years agoShould not send classic commands on le link am: 25b8b04caa
Chris Manton [Thu, 22 Oct 2020 22:50:53 +0000 (22:50 +0000)]
Should not send classic commands on le link am: 25b8b04caa

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

Change-Id: I285ef816b8abace08dae2f59fc6b92a3d0255ec6

3 years agoReturn after gd acl creates connection am: 175ea68186
Chris Manton [Thu, 22 Oct 2020 22:50:07 +0000 (22:50 +0000)]
Return after gd acl creates connection am: 175ea68186

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

Change-Id: I06d98ef95e339d983b35350e483e555550ab3153

3 years agoL2cap API: Use GD L2cap flag am: 43a4028ecb am: 877e337675
Hansong Zhang [Thu, 22 Oct 2020 21:54:34 +0000 (21:54 +0000)]
L2cap API: Use GD L2cap flag am: 43a4028ecb am: 877e337675

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

Change-Id: I5edd53d974685de270161dfaccec1a4eeddcb88f

3 years agoBTM_ACL: Remove unused code am: 85a4ce1ebd am: 3d451869c9
Hansong Zhang [Thu, 22 Oct 2020 21:44:48 +0000 (21:44 +0000)]
BTM_ACL: Remove unused code am: 85a4ce1ebd am: 3d451869c9

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

Change-Id: Id801608cf8f24c0d6e03944d8af6aa002c70e76b

3 years agoL2cap API: Use GD L2cap flag am: 43a4028ecb
Hansong Zhang [Thu, 22 Oct 2020 21:29:29 +0000 (21:29 +0000)]
L2cap API: Use GD L2cap flag am: 43a4028ecb

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

Change-Id: I036c088835c279d6054bae09f7ea54e7f1802a48

3 years agoBTM_ACL: Remove unused code am: 85a4ce1ebd
Hansong Zhang [Thu, 22 Oct 2020 20:47:50 +0000 (20:47 +0000)]
BTM_ACL: Remove unused code am: 85a4ce1ebd

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

Change-Id: Ie5aecd881f87bc5ae2efd7ba03d0678014a29a5a

3 years agoUse stack/acl/btm_acl::acl_process_extended_features
Chris Manton [Thu, 22 Oct 2020 17:35:56 +0000 (10:35 -0700)]
Use stack/acl/btm_acl::acl_process_extended_features

Bug: 166280067
Tag: #refactor
Test: Pair classic device

Change-Id: I1a87ea23c8b4590a313652dca78b0e51354ecb33

3 years agoAdd stack/acl/btm_acl::acl_process_extended_features
Chris Manton [Thu, 22 Oct 2020 17:35:39 +0000 (10:35 -0700)]
Add stack/acl/btm_acl::acl_process_extended_features

Bug: 166280067
Tag: #refactor
Test: Pair classic device

Change-Id: I1136fae14a3673f6dc76b8d3d08414525690f8b3

3 years agoAdd main/shim/acl_legacy_interface::btm_acl_role_changed
Chris Manton [Thu, 22 Oct 2020 17:32:05 +0000 (10:32 -0700)]
Add main/shim/acl_legacy_interface::btm_acl_role_changed

Bug: 166280067
Tag: #refactor
Test: Pair classic device

Change-Id: Ie4f2c31ed449a5bf9353efb3ab640cbbbfab211f

3 years agoAdd tHCI_STATUS to btm_acl_role_changed
Chris Manton [Thu, 22 Oct 2020 19:55:44 +0000 (12:55 -0700)]
Add tHCI_STATUS to btm_acl_role_changed

Bug: 166280067
Tag: #refactor
Test: Pair classic device

Change-Id: I5ba4b72585e9cd9e0e0e45935f6e4a328fc28581

3 years agoShould not send classic commands on le link
Chris Manton [Tue, 20 Oct 2020 23:57:27 +0000 (16:57 -0700)]
Should not send classic commands on le link

Bug: 171491610
Tag: #refactor
Test: verified on wireshark

Change-Id: I1428ea803a6dd327a81209a4f710d96a8d6612be

3 years agoReturn after gd acl creates connection
Chris Manton [Thu, 22 Oct 2020 17:47:09 +0000 (10:47 -0700)]
Return after gd acl creates connection

Bug: 166280067
Tag: #refactor
Test: Pair classic device

Change-Id: Ie18dc8ba759b6fd20b7cd041a86c86b94c7e9e1f

3 years agobtm_acl_encrypt_change: Use handle directly am: e61cae84a1 am: 45dd009a74
Hansong Zhang [Thu, 22 Oct 2020 07:27:16 +0000 (07:27 +0000)]
btm_acl_encrypt_change: Use handle directly am: e61cae84a1 am: 45dd009a74

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

Change-Id: I4f6e2ffd3382fbe30005693767c10aea0bff99e9

3 years agoFlatten btm_sec_start_encryption am: 2da963b73e am: 96fe19855e
Hansong Zhang [Thu, 22 Oct 2020 07:27:13 +0000 (07:27 +0000)]
Flatten btm_sec_start_encryption am: 2da963b73e am: 96fe19855e

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

Change-Id: If6a507c311c770f5269a58629f8d5364d090cd0f

3 years agoMerge changes Ie1b2f0f6,I5f115595,I7c766087,If341f69a,Idba0190c, ... am: 8b39458f97...
Treehugger Robot [Thu, 22 Oct 2020 07:24:19 +0000 (07:24 +0000)]
Merge changes Ie1b2f0f6,I5f115595,I7c766087,If341f69a,Idba0190c, ... am: 8b39458f97 am: 2b8351bc80

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

Change-Id: I7379e76fc994e7e4fcaa33de391a4b14da20c11d

3 years agobtm_acl_encrypt_change: Use handle directly am: e61cae84a1
Hansong Zhang [Thu, 22 Oct 2020 06:56:28 +0000 (06:56 +0000)]
btm_acl_encrypt_change: Use handle directly am: e61cae84a1

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

Change-Id: I8a3a6d4c31615792fc9c91e03f332a4edd4ee10a

3 years agoFlatten btm_sec_start_encryption am: 2da963b73e
Hansong Zhang [Thu, 22 Oct 2020 06:56:24 +0000 (06:56 +0000)]
Flatten btm_sec_start_encryption am: 2da963b73e

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

Change-Id: I460c4318572d27f5a504064ac8d9da632ab8e961

3 years agoMerge changes Ie1b2f0f6,I5f115595,I7c766087,If341f69a,Idba0190c, ... am: 8b39458f97
Treehugger Robot [Thu, 22 Oct 2020 06:52:20 +0000 (06:52 +0000)]
Merge changes Ie1b2f0f6,I5f115595,I7c766087,If341f69a,Idba0190c, ... am: 8b39458f97

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

Change-Id: I566ef8d048349e2bc0a7a4e8a87aa3577c1d80e7

3 years agoL2cap API: Use GD L2cap flag
Hansong Zhang [Mon, 19 Oct 2020 22:47:35 +0000 (15:47 -0700)]
L2cap API: Use GD L2cap flag

Bug: 141555841
Test: cert/run --host
Tag: #gd-refactor
Change-Id: I2c6a67e3f74616d7bd2845049af4273088648de4