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

Zach Johnson [Wed, 26 Aug 2020 23:19:26 +0000 (16:19 -0700)]

Convert gap_connections to new l2cap + security

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

commit | commitdiff | tree

Treehugger Robot [Wed, 26 Aug 2020 22:55:04 +0000 (22:55 +0000)]

Merge "Make GD LeSecurityTest pass on real devices"

commit | commitdiff | tree

Jakub Pawlowski [Fri, 21 Aug 2020 15:39:11 +0000 (17:39 +0200)]

Make GD LeSecurityTest pass on real devices

This patch contain couple fixes that stabilize LeSecurityTest
When running with --host flag, the virtual execution environment is much
more stable, but on real devices more guarantees around address handling
and disconnection are needed.

Bug: 155399771
Test: cert/run LeSecurityTest
Tag: #gd-refactor
Change-Id: I1f2d7e58600168140009458a2d31509edc19e8c4

commit | commitdiff | tree

Zach Johnson [Wed, 26 Aug 2020 22:07:13 +0000 (22:07 +0000)]

Merge changes I6e42378e,I04ab0633,I97318502

* changes:
  Remove BTM_SimpleSetSecurityLevel
  Migrate GATT security
  Migrate SDP to L2CA_ConnectReq2

commit | commitdiff | tree

Treehugger Robot [Wed, 26 Aug 2020 20:38:25 +0000 (20:38 +0000)]

Merge changes I01baf211,I320b9709,I4045258b,I7d09393f,I7e983860

* changes:
  remove def stack/acl/btm_pm::BTM_SSR_INCLUDED
  Encapsulate tACL_CB::tACL_CONN::switch_role_state
  Enacpsulate tACL_CB::tACL_CONN::encrypt_state
  Use API from stack/btu/btu_hcif::l2c_link_role_changed
  Slightly Streamline l2c_link_hci_conn_comp

commit | commitdiff | tree

Treehugger Robot [Wed, 26 Aug 2020 20:04:54 +0000 (20:04 +0000)]

Merge "GD-Cert: Add btconfig parameter to real device test"

commit | commitdiff | tree

Treehugger Robot [Wed, 26 Aug 2020 18:32:44 +0000 (18:32 +0000)]

Merge "Fuzzer for g722 encoder"

commit | commitdiff | tree

Chris Manton [Wed, 19 Aug 2020 16:14:59 +0000 (09:14 -0700)]

remove def stack/acl/btm_pm::BTM_SSR_INCLUDED

Because when false untested hence unsupported

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

commit | commitdiff | tree

Chris Manton [Sun, 23 Aug 2020 06:26:47 +0000 (23:26 -0700)]

Encapsulate tACL_CB::tACL_CONN::switch_role_state

Towards proper interfaces

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

Change-Id: I320b9709a23746e5c7e752214126dafcf158b26a

commit | commitdiff | tree

Chris Manton [Sun, 23 Aug 2020 05:45:02 +0000 (22:45 -0700)]

Enacpsulate tACL_CB::tACL_CONN::encrypt_state

Towards proper interfaces

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

Change-Id: I4045258b5c2c8cda12c873111e4d8eb22a38475b

commit | commitdiff | tree

Chris Manton [Mon, 17 Aug 2020 23:45:45 +0000 (16:45 -0700)]

Use API from stack/btu/btu_hcif::l2c_link_role_changed

From: stack/btu/btu_hcif
Into: stack/acl/btm_acl

Towards proper interfaces

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

commit | commitdiff | tree

Chris Manton [Wed, 26 Aug 2020 15:58:37 +0000 (08:58 -0700)]

Slightly Streamline l2c_link_hci_conn_comp

Towards readable code

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

GD-Cert: Add btconfig parameter to real device test

* Pull config from device when done

Bug: 165828962
Test: gd/cert/run
Tag: #gd-refactor
Change-Id: Ic995f5767cdc94ba93d370037b7f1f32b97ceac2

commit | commitdiff | tree

Treehugger Robot [Wed, 26 Aug 2020 17:57:44 +0000 (17:57 +0000)]

Merge "RootCanal: Reset the model in BluetoothHci::close"

commit | commitdiff | tree

Treehugger Robot [Wed, 26 Aug 2020 16:48:43 +0000 (16:48 +0000)]

Merge changes Ic28ba99f,I353efe8c,I2c0908fd,I860b744c,Icc9ad82c

* changes:
  Remove bta knowledge of hci handle
  Streamline bta/dm/::bta_dm_acl_up/down
  Add API stack/acl/btm_acl::acl_peer_supports_sniff_subrating
  Remove def bta/dm/BTM_SSR_INCLUDED
  Rework api ret val BTA_DmGetConnectionState

commit | commitdiff | tree

Myles Watson [Wed, 26 Aug 2020 14:30:00 +0000 (07:30 -0700)]

RootCanal: Reset the model in BluetoothHci::close

Bug: 166326066
Tag: #stability
Test: com.android.devicehealthchecks
Change-Id: Ia75d07e34a38a74d2f09b6174a387089029e9318

commit | commitdiff | tree

Zach Johnson [Wed, 26 Aug 2020 15:17:10 +0000 (15:17 +0000)]

Merge changes I5b76ec20,I11c768ec,I36a436de,I7b30020b,Ie6b729f1, ...

* changes:
  goodbye BTM_SetOutService
  Inline BNEP security
  Remove more vestiges of PAN GN
  Pan role is never GN
  Simplify PAN role setting
  btpan_enable is never called from JNI
  Remove stray out service call

commit | commitdiff | tree

Zach Johnson [Wed, 26 Aug 2020 03:01:48 +0000 (03:01 +0000)]

Merge changes I8edd2a9f,I12ce8b9c,Ida0979e5,Ie814f10f,I2272aadd

* changes:
  Correct hidd/h interrupt channel security
  Flatten avdt sec_mask
  Inline avdt security
  Inline HIDH security
  inline HIDD security

commit | commitdiff | tree

HsingYuan Lo [Wed, 26 Aug 2020 01:14:08 +0000 (01:14 +0000)]

Merge "Add experimental flag for GATT Robust Caching"

commit | commitdiff | tree

Zach Johnson [Wed, 26 Aug 2020 00:32:58 +0000 (17:32 -0700)]

Remove BTM_SimpleSetSecurityLevel

no longer needed

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

commit | commitdiff | tree

Zach Johnson [Wed, 26 Aug 2020 00:31:11 +0000 (17:31 -0700)]

Migrate GATT security

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

commit | commitdiff | tree

Zach Johnson [Wed, 26 Aug 2020 00:28:34 +0000 (17:28 -0700)]

Migrate SDP to L2CA_ConnectReq2

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

commit | commitdiff | tree

Zach Johnson [Wed, 26 Aug 2020 00:25:57 +0000 (17:25 -0700)]

goodbye BTM_SetOutService

you will not be missed

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

commit | commitdiff | tree

Zach Johnson [Wed, 26 Aug 2020 00:22:37 +0000 (17:22 -0700)]

Inline BNEP security

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

commit | commitdiff | tree

Zach Johnson [Wed, 26 Aug 2020 00:08:19 +0000 (17:08 -0700)]

Remove more vestiges of PAN GN

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

commit | commitdiff | tree

Zach Johnson [Wed, 26 Aug 2020 00:03:23 +0000 (17:03 -0700)]

Pan role is never GN

we only support PANU and NAP

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 23:52:54 +0000 (16:52 -0700)]

Simplify PAN role setting

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 23:47:43 +0000 (16:47 -0700)]

btpan_enable is never called from JNI

so don't even give it an option to in the future

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 22:56:59 +0000 (15:56 -0700)]

Remove stray out service call

Forgotten in other patch

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 22:52:17 +0000 (15:52 -0700)]

Correct hidd/h interrupt channel security

the legacy stack had it as none, but security was implied
since the channels can't exist without the protected channel
up.

Add security for consistency.

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 22:45:43 +0000 (15:45 -0700)]

Flatten avdt sec_mask

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 22:29:36 +0000 (15:29 -0700)]

Inline avdt security

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 21:34:13 +0000 (14:34 -0700)]

Add connect request variants that do security

also use them in avct

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 22:19:31 +0000 (15:19 -0700)]

Inline HIDH security

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 17:51:10 +0000 (10:51 -0700)]

Add L2CA_Register2, which does security for you

start using it in a few places

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 22:02:20 +0000 (15:02 -0700)]

inline HIDD security

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 22:26:34 +0000 (22:26 +0000)]

Merge "AVDT: Flatten sec mask"

commit | commitdiff | tree

Treehugger Robot [Tue, 25 Aug 2020 22:00:20 +0000 (22:00 +0000)]

Merge "Add helper to decode hci status"

commit | commitdiff | tree

Treehugger Robot [Tue, 25 Aug 2020 21:54:50 +0000 (21:54 +0000)]

Merge changes Ie433896f,I762a7f2f

* changes:
Add main/shim/helper raw builder packet creator
Remove unused hci error status

commit | commitdiff | tree

Treehugger Robot [Tue, 25 Aug 2020 21:54:32 +0000 (21:54 +0000)]

Merge "Break out stack/include/hci_error_code"

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 20:55:25 +0000 (13:55 -0700)]

Remove bta knowledge of hci handle

Want all the handles back

Towards proper interfaces

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

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 21:02:15 +0000 (14:02 -0700)]

Streamline bta/dm/::bta_dm_acl_up/down

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 20:47:27 +0000 (13:47 -0700)]

Add API stack/acl/btm_acl::acl_peer_supports_sniff_subrating

Towards proper interfaces

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

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 19:24:08 +0000 (12:24 -0700)]

Remove def bta/dm/BTM_SSR_INCLUDED

Towards readability

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

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 19:18:17 +0000 (12:18 -0700)]

Rework api ret val BTA_DmGetConnectionState

Towards proper interfaces

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

Change-Id: Icc9ad82c78c2ecc73ea167c3595f35a7fc1b09b9

commit | commitdiff | tree

Hansong Zhang [Tue, 25 Aug 2020 19:26:46 +0000 (12:26 -0700)]

AVDT: Flatten sec mask

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

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 17:52:11 +0000 (10:52 -0700)]

Add helper to decode hci status

Bug: 166280067
Tag: #gd-refactor
Test: compile & verify basic functions working
Change-Id: Ifb04fa089770d876705601a36608226375c29132

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 17:24:14 +0000 (10:24 -0700)]

Add main/shim/helper raw builder packet creator

Bug: 166280067
Tag: #gd-refactor
Test: compile & verify basic functions working
Change-Id: Ie433896f12e1f3ec302f198415df5fd5900969c5

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 18:19:48 +0000 (11:19 -0700)]

Remove unused hci error status

stack/include/hci_error_code.h

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

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 17:51:29 +0000 (10:51 -0700)]

Break out stack/include/hci_error_code

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

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 17:32:11 +0000 (17:32 +0000)]

Merge changes Ieb632fc4,I7152fcf3,I4ed86627,Ib7d747de,I8991b2ca am: c42920d827

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

Change-Id: I1ae5afd81c3f5bb83b1618436e4be4cd6d18e9ad

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 17:32:01 +0000 (17:32 +0000)]

Merge changes I7a6cab84,Icbc20044 am: 5e9496d773

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

Change-Id: I792d115c6860d53239de27d8c9bc882838bac95b

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 17:15:03 +0000 (17:15 +0000)]

Merge changes Ieb632fc4,I7152fcf3,I4ed86627,Ib7d747de,I8991b2ca

* changes:
  AG: Fold sec mask
  Clean up PAN code
  Clean up HIDH code
  HID Host: Clean up sec mask
  PAN: Clean up sec mask

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 16:23:57 +0000 (16:23 +0000)]

Merge changes I7a6cab84,Icbc20044

* changes:
Fold out service setting into avdt_ad_open_req
Fold set out service into BNEP_Connect

Fuzzer for g722 encoder

Max-length of Input provided to fuzzer is 4096. Ideally it would be less
than that in the encoder call.

To Build the fuzzer:
SANITIZE_TARGET=hwaddress m g722_enc_fuzzer

To run(on device):
adb shell data/fuzz/arm64/g722_enc_fuzzer/g722_enc_fuzzer

Bug: 164457579
Tag: #security
Test: Tested on pixel 4 with no initial corpus and getting ~6000 exec/s
Change-Id: I8392e2d3b432f213402789fd6af60901b1df8bdc

commit | commitdiff | tree

Hansong Zhang [Tue, 25 Aug 2020 06:52:13 +0000 (06:52 +0000)]

HF Client: Flatten sec mask for outgoing connection am: b1a1f6c9c8

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

Change-Id: I8d71a73c59a49185f754f336143bf4375d250d5a

commit | commitdiff | tree

Hansong Zhang [Tue, 25 Aug 2020 06:52:11 +0000 (06:52 +0000)]

HF Client: Flatten sec mask am: d649cd3c86

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

Change-Id: I0e820d801ccee452e154ffdd76a4a341513de3bb

commit | commitdiff | tree

HsingYuan Lo [Mon, 24 Aug 2020 09:53:08 +0000 (17:53 +0800)]

Add experimental flag for GATT Robust Caching

Bug: 154056389
Test: atest bluetooth_test_gd:InitFlagsTest
Tag: #feature
Change-Id: Ifb9a89cc7ba52e4b6551625ad63767d512cd04bd

commit | commitdiff | tree

Hansong Zhang [Mon, 24 Aug 2020 23:38:07 +0000 (16:38 -0700)]

AG: Fold sec mask

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

commit | commitdiff | tree

Hansong Zhang [Mon, 24 Aug 2020 21:28:07 +0000 (14:28 -0700)]

HF Client: Flatten sec mask for outgoing connection

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

commit | commitdiff | tree

Hansong Zhang [Mon, 24 Aug 2020 21:23:44 +0000 (14:23 -0700)]

HF Client: Flatten sec mask

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

commit | commitdiff | tree

Hansong Zhang [Mon, 24 Aug 2020 22:56:52 +0000 (15:56 -0700)]

Clean up PAN code

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

commit | commitdiff | tree

Hansong Zhang [Mon, 24 Aug 2020 22:49:54 +0000 (15:49 -0700)]

Clean up HIDH code

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

commit | commitdiff | tree

Hansong Zhang [Mon, 24 Aug 2020 22:31:18 +0000 (15:31 -0700)]

HID Host: Clean up sec mask

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

commit | commitdiff | tree

Hansong Zhang [Mon, 24 Aug 2020 21:45:36 +0000 (14:45 -0700)]

PAN: Clean up sec mask

NAP and PANU require encryption and authenticated link key, and GN
requires no security.

Also update Security Description in SDP record.

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

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 04:15:05 +0000 (04:15 +0000)]

Remove stack/acl/btm_acl::acl_send_data_packet am: 1cd595b3c1

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

Change-Id: I2a1abba440eea35f2b8aff05830b727e50d55af9

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 04:15:03 +0000 (04:15 +0000)]

Use Api stack/acl/btm_acl::acl_send_data_packet am: 68a040a5d2

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

Change-Id: Ie7ec81e021b8cf77783fdf9d939d53525871c071

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 04:15:01 +0000 (04:15 +0000)]

Split Api stack/acl/btm_acl::acl_send_data_packet am: a30b0d4232

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

Change-Id: I548ee3423f4c66fd75ab80f11432f56cfd78190a

commit | commitdiff | tree

Chris Manton [Tue, 25 Aug 2020 04:14:59 +0000 (04:14 +0000)]

Re-include stack/l2cap/l2c_api am: 302c600873

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

Change-Id: I5391c0ea020fce3aff849fc71525ecd69ac7cfff

commit | commitdiff | tree

Chris Manton [Mon, 24 Aug 2020 22:20:28 +0000 (15:20 -0700)]

Remove stack/acl/btm_acl::acl_send_data_packet

Towards proper interfaces

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

commit | commitdiff | tree

Chris Manton [Mon, 24 Aug 2020 21:33:28 +0000 (14:33 -0700)]

Use Api stack/acl/btm_acl::acl_send_data_packet

Provide separate br_edr and ble entry points

Towards proper interfaces

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

commit | commitdiff | tree

Chris Manton [Mon, 24 Aug 2020 21:30:03 +0000 (14:30 -0700)]

Split Api stack/acl/btm_acl::acl_send_data_packet

Provide separate br_edr and ble entry points

Towards proper interfaces

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

commit | commitdiff | tree

Chris Manton [Mon, 24 Aug 2020 16:12:49 +0000 (09:12 -0700)]

Re-include stack/l2cap/l2c_api

Towards readable code

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

commit | commitdiff | tree

Treehugger Robot [Tue, 25 Aug 2020 00:26:29 +0000 (00:26 +0000)]

Merge changes Id30b0dc4,I27168e1f,Id6a4d6e2,I9c011afa,I5a19a21c, ... am: e80eb879f5

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

Change-Id: I814357211107b259f740526a351125045746b013

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 00:26:20 +0000 (00:26 +0000)]

Merge changes I436836d3,I6431ab48,I3b5c8786,I5d4d15ec,Id97ddfce, ... am: 730b5eff20

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

Change-Id: Ib5826b1ce1a8fb2c44a93c401535bcd5ade2616b

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 00:25:58 +0000 (00:25 +0000)]

Merge changes I3df02f6a,I97d16350,Ia6ffaa4f am: 81b7d5872d

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

Change-Id: I4ba99d0e6f1d99eef90d3a470eecbbb4cc4cbd03

commit | commitdiff | tree

Zach Johnson [Tue, 25 Aug 2020 00:03:25 +0000 (17:03 -0700)]

Fold out service setting into avdt_ad_open_req

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 23:52:25 +0000 (16:52 -0700)]

Fold set out service into BNEP_Connect

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

commit | commitdiff | tree

Treehugger Robot [Tue, 25 Aug 2020 00:03:40 +0000 (00:03 +0000)]

Merge changes Id30b0dc4,I27168e1f,Id6a4d6e2,I9c011afa,I5a19a21c, ...

* changes:
  Fold security level calls into hidd_conn_reg
  Fold HID_DevSetSecurityLevel into device registration
  Fold security level into HID_DevSetSecurityLevel
  Fold security mask into AVCT_Register
  Remove sys id param from bta_ar_dereg_avdt
  Remove sys id param from bta_ar_reg_avdt

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 23:38:00 +0000 (23:38 +0000)]

Merge changes I436836d3,I6431ab48,I3b5c8786,I5d4d15ec,Id97ddfce, ...

* changes:
  Remove sys id param from bta_ar_dereg_avrc
  Remove sys id param from bta_ar_reg_avrc
  Remove sys id param from bta_ar_dereg_avct
  Remove sys id param from bta_ar_reg_avct
  BTA_AR_INCLUDED is always true
  Remove p_avk_conn_cback, it's never set
  Remove BTA_ID_AVK

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 23:37:30 +0000 (23:37 +0000)]

Merge changes I3df02f6a,I97d16350,Ia6ffaa4f

* changes:
  Fold security mask into bta_ar_reg_avct
  Add RFCOMM_CreateConnectionWithSecurity
  Add BTM_SimpleSetSecurityLevel

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 22:33:15 +0000 (15:33 -0700)]

Fold security level calls into hidd_conn_reg

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 22:30:15 +0000 (15:30 -0700)]

Fold HID_DevSetSecurityLevel into device registration

brings it a little closer to the l2cap calls

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 22:26:07 +0000 (15:26 -0700)]

Fold security level into HID_DevSetSecurityLevel

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 22:17:42 +0000 (15:17 -0700)]

Fold security mask into AVCT_Register

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 22:13:32 +0000 (15:13 -0700)]

Remove sys id param from bta_ar_dereg_avdt

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 22:11:48 +0000 (15:11 -0700)]

Remove sys id param from bta_ar_reg_avdt

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 22:02:13 +0000 (15:02 -0700)]

Remove sys id param from bta_ar_dereg_avrc

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 21:59:57 +0000 (14:59 -0700)]

Remove sys id param from bta_ar_reg_avrc

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 21:56:52 +0000 (14:56 -0700)]

Remove sys id param from bta_ar_dereg_avct

it's always the same

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 21:53:35 +0000 (14:53 -0700)]

Remove sys id param from bta_ar_reg_avct

it only has one value ever

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 21:42:48 +0000 (14:42 -0700)]

BTA_AR_INCLUDED is always true

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 21:39:38 +0000 (14:39 -0700)]

Remove p_avk_conn_cback, it's never set

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 21:18:40 +0000 (14:18 -0700)]

Fold security mask into bta_ar_reg_avct

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

commit | commitdiff | tree

Zach Johnson [Mon, 24 Aug 2020 21:24:12 +0000 (14:24 -0700)]

Remove BTA_ID_AVK

It's not used.

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

commit | commitdiff | tree

Zach Johnson [Fri, 21 Aug 2020 23:46:20 +0000 (16:46 -0700)]

Add RFCOMM_CreateConnectionWithSecurity

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

commit | commitdiff | tree

Treehugger Robot [Mon, 24 Aug 2020 21:17:12 +0000 (21:17 +0000)]

Merge "Remove unused code in GAP_API" am: 2a20234285

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

Change-Id: I57ed066eb19302eddedc5d05d21807a89620138b

commit | commitdiff | tree

Treehugger Robot [Mon, 24 Aug 2020 21:17:06 +0000 (21:17 +0000)]

Merge changes Iad937e36,I046593d1 am: 70c73996da

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

Change-Id: I6f1a872d25ff14e51cff5b84e8bd6ad4a0d1a56b

commit | commitdiff | tree

Treehugger Robot [Mon, 24 Aug 2020 21:16:27 +0000 (21:16 +0000)]

Merge changes I4ebefde3,I2817cd86 am: 4260459503

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

Change-Id: Id833da4a66a27763ec91aa35738827fc3a6fa473

commit | commitdiff | tree

Treehugger Robot [Mon, 24 Aug 2020 21:14:29 +0000 (21:14 +0000)]