OSDN Git Service

android-x86/system-bt.git
4 years agoMerge changes I8edd2a9f,I12ce8b9c,Ida0979e5,Ie814f10f,I2272aadd
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

4 years agoMerge "Add experimental flag for GATT Robust Caching"
HsingYuan Lo [Wed, 26 Aug 2020 01:14:08 +0000 (01:14 +0000)]
Merge "Add experimental flag for GATT Robust Caching"

4 years agoCorrect hidd/h interrupt channel security
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

4 years agoFlatten avdt sec_mask
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

4 years agoInline avdt security
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

4 years agoAdd connect request variants that do security
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

4 years agoInline HIDH security
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

4 years agoAdd L2CA_Register2, which does security for you
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

4 years agoinline HIDD security
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

4 years agoMerge "AVDT: Flatten sec mask"
Zach Johnson [Tue, 25 Aug 2020 22:26:34 +0000 (22:26 +0000)]
Merge "AVDT: Flatten sec mask"

4 years agoMerge "Add helper to decode hci status"
Treehugger Robot [Tue, 25 Aug 2020 22:00:20 +0000 (22:00 +0000)]
Merge "Add helper to decode hci status"

4 years agoMerge changes Ie433896f,I762a7f2f
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

4 years agoMerge "Break out stack/include/hci_error_code"
Treehugger Robot [Tue, 25 Aug 2020 21:54:32 +0000 (21:54 +0000)]
Merge "Break out stack/include/hci_error_code"

4 years agoAVDT: Flatten sec mask
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

4 years agoAdd helper to decode hci status
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

4 years agoAdd main/shim/helper raw builder packet creator
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

4 years agoRemove unused hci error status
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

4 years agoBreak out stack/include/hci_error_code
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

4 years agoMerge changes Ieb632fc4,I7152fcf3,I4ed86627,Ib7d747de,I8991b2ca am: c42920d827
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

4 years agoMerge changes I7a6cab84,Icbc20044 am: 5e9496d773
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

4 years agoMerge changes Ieb632fc4,I7152fcf3,I4ed86627,Ib7d747de,I8991b2ca
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

4 years agoMerge changes I7a6cab84,Icbc20044
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

4 years agoHF Client: Flatten sec mask for outgoing connection am: b1a1f6c9c8
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

4 years agoHF Client: Flatten sec mask am: d649cd3c86
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

4 years agoAdd experimental flag for GATT Robust Caching
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

4 years agoAG: Fold sec mask
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

4 years agoHF Client: Flatten sec mask for outgoing connection
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

4 years agoHF Client: Flatten sec mask
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

4 years agoClean up PAN code
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

4 years agoClean up HIDH code
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

4 years agoHID Host: Clean up sec mask
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

4 years agoPAN: Clean up sec mask
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

4 years agoRemove stack/acl/btm_acl::acl_send_data_packet am: 1cd595b3c1
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

4 years agoUse Api stack/acl/btm_acl::acl_send_data_packet am: 68a040a5d2
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

4 years agoSplit Api stack/acl/btm_acl::acl_send_data_packet am: a30b0d4232
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

4 years agoRe-include stack/l2cap/l2c_api am: 302c600873
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

4 years agoRemove stack/acl/btm_acl::acl_send_data_packet
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

4 years agoUse Api stack/acl/btm_acl::acl_send_data_packet
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

4 years agoSplit Api stack/acl/btm_acl::acl_send_data_packet
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

4 years agoRe-include stack/l2cap/l2c_api
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

4 years agoMerge changes Id30b0dc4,I27168e1f,Id6a4d6e2,I9c011afa,I5a19a21c, ... am: e80eb879f5
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

4 years agoMerge changes I436836d3,I6431ab48,I3b5c8786,I5d4d15ec,Id97ddfce, ... am: 730b5eff20
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

4 years agoMerge changes I3df02f6a,I97d16350,Ia6ffaa4f am: 81b7d5872d
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

4 years agoFold out service setting into avdt_ad_open_req
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

4 years agoFold set out service into BNEP_Connect
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

4 years agoMerge changes Id30b0dc4,I27168e1f,Id6a4d6e2,I9c011afa,I5a19a21c, ...
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

4 years agoMerge changes I436836d3,I6431ab48,I3b5c8786,I5d4d15ec,Id97ddfce, ...
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

4 years agoMerge changes I3df02f6a,I97d16350,Ia6ffaa4f
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

4 years agoFold security level calls into hidd_conn_reg
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

4 years agoFold HID_DevSetSecurityLevel into device registration
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

4 years agoFold security level into HID_DevSetSecurityLevel
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

4 years agoFold security mask into AVCT_Register
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

4 years agoRemove sys id param from bta_ar_dereg_avdt
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

4 years agoRemove sys id param from bta_ar_reg_avdt
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

4 years agoRemove sys id param from bta_ar_dereg_avrc
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

4 years agoRemove sys id param from bta_ar_reg_avrc
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

4 years agoRemove sys id param from bta_ar_dereg_avct
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

4 years agoRemove sys id param from bta_ar_reg_avct
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

4 years agoBTA_AR_INCLUDED is always true
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

4 years agoRemove p_avk_conn_cback, it's never set
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

4 years agoFold security mask into bta_ar_reg_avct
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

4 years agoRemove BTA_ID_AVK
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

4 years agoAdd RFCOMM_CreateConnectionWithSecurity
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

4 years agoMerge "Remove unused code in GAP_API" am: 2a20234285
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

4 years agoMerge changes Iad937e36,I046593d1 am: 70c73996da
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

4 years agoMerge changes I4ebefde3,I2817cd86 am: 4260459503
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

4 years agoMerge "Remove unused code in GAP_API"
Treehugger Robot [Mon, 24 Aug 2020 21:14:29 +0000 (21:14 +0000)]
Merge "Remove unused code in GAP_API"

4 years agoAdd BTM_SimpleSetSecurityLevel
Zach Johnson [Fri, 21 Aug 2020 23:13:27 +0000 (16:13 -0700)]
Add BTM_SimpleSetSecurityLevel

Simplify security a bit

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

4 years agoMerge changes Iad937e36,I046593d1
Treehugger Robot [Mon, 24 Aug 2020 20:03:44 +0000 (20:03 +0000)]
Merge changes Iad937e36,I046593d1

* changes:
  Encapsulate tL2C_CB::tL2C_LCB::handle
  Always unset def L2CAP_CBB_DEFAULT_DATA_RATE_BUFF_QUOTA

4 years agoMerge changes I4ebefde3,I2817cd86
Treehugger Robot [Mon, 24 Aug 2020 20:02:47 +0000 (20:02 +0000)]
Merge changes I4ebefde3,I2817cd86

* changes:
  RootCanal: Add Iso Commands to controller
  RootCanal: Create Connection Cancel

4 years agoUse Api stack/acl/btm_acl::acl_write_automatic_flush_timeout am: 2f9c49f885
Chris Manton [Mon, 24 Aug 2020 19:32:40 +0000 (19:32 +0000)]
Use Api stack/acl/btm_acl::acl_write_automatic_flush_timeout am: 2f9c49f885

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

Change-Id: Ife1ae12badc6074d0a216ffb28912c66b0069a0f

4 years agoAdd Api stack/acl/btm_acl::acl_write_automatic_flush_timeout am: ee09bed09c
Chris Manton [Mon, 24 Aug 2020 19:32:39 +0000 (19:32 +0000)]
Add Api stack/acl/btm_acl::acl_write_automatic_flush_timeout am: ee09bed09c

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

Change-Id: I6ed527ebc7671f93885bdd7a2c634f94bf2b88db

4 years agoPlease look but don't touch the parameters am: 9c44295696
Chris Manton [Mon, 24 Aug 2020 19:32:38 +0000 (19:32 +0000)]
Please look but don't touch the parameters am: 9c44295696

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

Change-Id: Icb33ded24f6f105a2e085bf7aab2753bad8675d7

4 years agoGroup similar values L2CA_SetFlushTimeout am: 0d8157874b
Chris Manton [Mon, 24 Aug 2020 19:32:36 +0000 (19:32 +0000)]
Group similar values L2CA_SetFlushTimeout am: 0d8157874b

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

Change-Id: I2b473d2773771b755dbbabeab4da0142e99b8d06

4 years agoValidate params first L2CA_SetFlushTimeout am: c853a28799
Chris Manton [Mon, 24 Aug 2020 19:32:35 +0000 (19:32 +0000)]
Validate params first L2CA_SetFlushTimeout am: c853a28799

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

Change-Id: Ice71428b5268318bae3f7e604c6f26f2638d0d9e

4 years agoColocate declarations and definitions am: 5feb114894
Chris Manton [Mon, 24 Aug 2020 19:32:34 +0000 (19:32 +0000)]
Colocate declarations and definitions am: 5feb114894

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

Change-Id: I04070fa857f30c0a06fabc0c45f1fc7fdc3a1f5b

4 years agoUse time units stack/l2cap/l2c_api::flush_tout am: 2d1b26ef62
Chris Manton [Mon, 24 Aug 2020 19:32:33 +0000 (19:32 +0000)]
Use time units stack/l2cap/l2c_api::flush_tout am: 2d1b26ef62

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

Change-Id: I354821d3d2fe6e1bdf472facc78b54f1736df8bf

4 years agoAdd ConvertMillisecondsToBasebandSlots am: ed5bd65775
Chris Manton [Mon, 24 Aug 2020 19:32:32 +0000 (19:32 +0000)]
Add ConvertMillisecondsToBasebandSlots am: ed5bd65775

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

Change-Id: I88669035e50d58fa52e33476ee79ce888e1084e7

4 years agoUse Api stack/acl/btm_acl::acl_disconnect am: bc8c16c412
Chris Manton [Mon, 24 Aug 2020 19:32:30 +0000 (19:32 +0000)]
Use Api stack/acl/btm_acl::acl_disconnect am: bc8c16c412

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

Change-Id: Ic5b795bb20c9c2203227ca55994b6c355ec956e0

4 years agoAdd Api stack/acl/btm_acl::acl_disconnect am: 26c76241e3
Chris Manton [Mon, 24 Aug 2020 19:32:29 +0000 (19:32 +0000)]
Add Api stack/acl/btm_acl::acl_disconnect am: 26c76241e3

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

Change-Id: I4e3447f3c66e05ffb7008b51818e738ac0d8b53f

4 years agoRe-include stack/btm/btm_dev.h am: e11b6bb724
Chris Manton [Mon, 24 Aug 2020 19:32:27 +0000 (19:32 +0000)]
Re-include stack/btm/btm_dev.h am: e11b6bb724

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

Change-Id: Ic0696ba05ba072759d91aff782c19739240c8d51

4 years agoRemove def BLE_PRIVACY_SPT am: b9403bab4d
Chris Manton [Mon, 24 Aug 2020 19:32:27 +0000 (19:32 +0000)]
Remove def BLE_PRIVACY_SPT am: b9403bab4d

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

Change-Id: I3ed633e438fca62d4f9cdc72c673c72a0b2db138

4 years agoRemove def BTM_DISC_DURING_RS am: da637852af
Chris Manton [Mon, 24 Aug 2020 19:32:22 +0000 (19:32 +0000)]
Remove def BTM_DISC_DURING_RS am: da637852af

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

Change-Id: I912567fc34ec52e514d735328d8dd23ff44ae38b

4 years agoRemove tL2C_CB::tL2C_LCB::p_hcit_rcv_acl am: d6f7bcf85f
Chris Manton [Mon, 24 Aug 2020 19:32:17 +0000 (19:32 +0000)]
Remove tL2C_CB::tL2C_LCB::p_hcit_rcv_acl am: d6f7bcf85f

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

Change-Id: I4fed0bd9d94f182dba8fe52adc9dbc975a0de929

4 years agoRemove unused code in GAP_API
Hansong Zhang [Mon, 24 Aug 2020 19:26:58 +0000 (12:26 -0700)]
Remove unused code in GAP_API

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

4 years agoProperly process the LE Long Term Key Request am: 178f8e5946
Jakub Pawlowski [Mon, 24 Aug 2020 16:03:47 +0000 (16:03 +0000)]
Properly process the LE Long Term Key Request am: 178f8e5946

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

Change-Id: If5def9c75ecdc350ac93d80303b5f4ddcc2b04e1

4 years agoRootCanal: Request Le LongTermKey am: 3ce975cfd8
Myles Watson [Mon, 24 Aug 2020 16:03:43 +0000 (16:03 +0000)]
RootCanal: Request Le LongTermKey am: 3ce975cfd8

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

Change-Id: Ifc6f936cefb3e5998c124f9ec1ddcc36dab6995b

4 years agoRootCanal: Add Iso Commands to controller
Myles Watson [Sat, 15 Aug 2020 00:28:30 +0000 (17:28 -0700)]
RootCanal: Add Iso Commands to controller

Bug: 163818400
Test: cert/run --host
Tag: #gd-refactor
Change-Id: I4ebefde325d8e3bb4d57c69b84be23c930d12ea6

4 years agoRootCanal: Create Connection Cancel
Myles Watson [Mon, 17 Aug 2020 18:53:59 +0000 (11:53 -0700)]
RootCanal: Create Connection Cancel

Bug: 163818400
Test: cert/run --host
Tag: #gd-refactor
Change-Id: I2817cd8659b2db6237b533f634953313c7ca1943

4 years agoEncapsulate tL2C_CB::tL2C_LCB::handle
Chris Manton [Mon, 24 Aug 2020 05:42:49 +0000 (22:42 -0700)]
Encapsulate tL2C_CB::tL2C_LCB::handle

Towards readable code

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

4 years agoUse Api stack/acl/btm_acl::acl_write_automatic_flush_timeout
Chris Manton [Thu, 20 Aug 2020 20:57:42 +0000 (13:57 -0700)]
Use Api stack/acl/btm_acl::acl_write_automatic_flush_timeout

Towards proper interfaces

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

4 years agoAdd Api stack/acl/btm_acl::acl_write_automatic_flush_timeout
Chris Manton [Thu, 20 Aug 2020 20:54:02 +0000 (13:54 -0700)]
Add Api stack/acl/btm_acl::acl_write_automatic_flush_timeout

Towards proper interfaces

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

4 years agoPlease look but don't touch the parameters
Chris Manton [Sun, 23 Aug 2020 23:29:07 +0000 (16:29 -0700)]
Please look but don't touch the parameters

Clean up API.  Only single client of this API

Towards readable code

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

4 years agoGroup similar values L2CA_SetFlushTimeout
Chris Manton [Sun, 23 Aug 2020 22:49:22 +0000 (15:49 -0700)]
Group similar values L2CA_SetFlushTimeout

Towards proper interfaces

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

4 years agoValidate params first L2CA_SetFlushTimeout
Chris Manton [Sun, 23 Aug 2020 22:43:29 +0000 (15:43 -0700)]
Validate params first L2CA_SetFlushTimeout

Towards proper interfaces

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

4 years agoColocate declarations and definitions
Chris Manton [Sun, 23 Aug 2020 22:22:01 +0000 (15:22 -0700)]
Colocate declarations and definitions

Also add proper variable naming

Towards proper interfaces

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

4 years agoUse time units stack/l2cap/l2c_api::flush_tout
Chris Manton [Sun, 23 Aug 2020 21:39:52 +0000 (14:39 -0700)]
Use time units stack/l2cap/l2c_api::flush_tout

Towards proper interfaces

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

4 years agoAdd ConvertMillisecondsToBasebandSlots
Chris Manton [Thu, 20 Aug 2020 22:06:43 +0000 (15:06 -0700)]
Add ConvertMillisecondsToBasebandSlots

Towards proper interfaces

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

4 years agoUse Api stack/acl/btm_acl::acl_disconnect
Chris Manton [Sun, 23 Aug 2020 20:47:51 +0000 (13:47 -0700)]
Use Api stack/acl/btm_acl::acl_disconnect

Towards proper interfaces

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

4 years agoAlways unset def L2CAP_CBB_DEFAULT_DATA_RATE_BUFF_QUOTA
Chris Manton [Mon, 24 Aug 2020 05:08:20 +0000 (22:08 -0700)]
Always unset def L2CAP_CBB_DEFAULT_DATA_RATE_BUFF_QUOTA

Towards readable code

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