OSDN Git Service

android-x86/system-bt.git
3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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"

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 years agoAdd Api stack/acl/btm_acl::acl_disconnect
Chris Manton [Sun, 23 Aug 2020 20:47:11 +0000 (13:47 -0700)]
Add Api stack/acl/btm_acl::acl_disconnect

Towards proper interfaces

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

3 years agoRe-include stack/btm/btm_dev.h
Chris Manton [Sat, 22 Aug 2020 19:33:58 +0000 (12:33 -0700)]
Re-include stack/btm/btm_dev.h

Towards proper interfaces

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

3 years agoRemove def BLE_PRIVACY_SPT
Chris Manton [Sat, 22 Aug 2020 23:30:34 +0000 (16:30 -0700)]
Remove def BLE_PRIVACY_SPT

Always TRUE; untested and unsupported when false

Towards readable code

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

3 years agoRemove def BTM_DISC_DURING_RS
Chris Manton [Sat, 22 Aug 2020 23:23:40 +0000 (16:23 -0700)]
Remove def BTM_DISC_DURING_RS

Always TRUE; untested and unsupported when false

Towards readable code

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

3 years agoRemove tL2C_CB::tL2C_LCB::p_hcit_rcv_acl
Chris Manton [Sun, 23 Aug 2020 18:55:19 +0000 (11:55 -0700)]
Remove tL2C_CB::tL2C_LCB::p_hcit_rcv_acl

Never allocated, but always freed buffer

Luckily it's always null

Towards readable code

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

3 years agoProperly process the LE Long Term Key Request
Jakub Pawlowski [Fri, 21 Aug 2020 15:39:11 +0000 (17:39 +0200)]
Properly process the LE Long Term Key Request

Stack in peripheral should properly accept and pass the LTK request.

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

3 years agoRootCanal: Request Le LongTermKey
Myles Watson [Fri, 21 Aug 2020 16:06:45 +0000 (09:06 -0700)]
RootCanal: Request Le LongTermKey

Use OwnAddressType for scanning and connections.

Make Random (for LE security) be an 8-byte array.

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

3 years agoEliminate useless stack vars l2c_link_send_to_lower_ am: d76d774ea2
Chris Manton [Sun, 23 Aug 2020 16:34:49 +0000 (16:34 +0000)]
Eliminate useless stack vars l2c_link_send_to_lower_ am: d76d774ea2

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

Change-Id: Idfc7352f387c5a63b03da11b51b5ba908f887339

3 years agoUse acl data passing API am: ee555f6ded
Chris Manton [Sun, 23 Aug 2020 16:34:34 +0000 (16:34 +0000)]
Use acl data passing API am: ee555f6ded

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

Change-Id: If386d3a6e521ec533fd3626935b0fb7f48ebb322

3 years agoadd acl data passing API am: 98cb1c46e0
Chris Manton [Sun, 23 Aug 2020 16:34:32 +0000 (16:34 +0000)]
add acl data passing API am: 98cb1c46e0

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

Change-Id: I10d628f8a1e9aadd40606bc06d0552b7568c3869

3 years agoSmooth l2c_link_send_to_lower/br_edr and ble am: 438bbe6f6e
Chris Manton [Sun, 23 Aug 2020 16:34:31 +0000 (16:34 +0000)]
Smooth l2c_link_send_to_lower/br_edr and ble am: 438bbe6f6e

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

Change-Id: Ied18d747c2718db3b53eb9cdbadeba82b17e0e26

3 years agoStreamline l2c_link_send_to_lower/br_edr and ble am: 5f843c24f5
Chris Manton [Sun, 23 Aug 2020 16:34:30 +0000 (16:34 +0000)]
Streamline l2c_link_send_to_lower/br_edr and ble am: 5f843c24f5

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

Change-Id: I93a027333be6dc4ee614759c6be126e1ec7e5ce4

3 years agoBreak out l2c_link_send_to_lower into br_edr and ble am: f0c7c82eba
Chris Manton [Sun, 23 Aug 2020 16:34:28 +0000 (16:34 +0000)]
Break out l2c_link_send_to_lower into br_edr and ble am: f0c7c82eba

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

Change-Id: I39f6532327a909edeb936421e4f047e44e950605

3 years agoAdd const stack/l2cap/l2c_link::l2c_link_send_to_lower am: 4edcd50c43
Chris Manton [Sun, 23 Aug 2020 16:34:26 +0000 (16:34 +0000)]
Add const stack/l2cap/l2c_link::l2c_link_send_to_lower am: 4edcd50c43

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

Change-Id: Ib4f2583d095abda871fb1d931fb386a65400927e

3 years agoRemove def L2CAP_HCI_FLOW_CONTROL_DEBUG am: 49743f152b
Chris Manton [Sun, 23 Aug 2020 16:34:23 +0000 (16:34 +0000)]
Remove def L2CAP_HCI_FLOW_CONTROL_DEBUG am: 49743f152b

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

Change-Id: If85ebf7ee398b1a809177bef3b9c40a055d42846

3 years agoBreak out data passing events am: 67c21c423b
Chris Manton [Sun, 23 Aug 2020 16:34:22 +0000 (16:34 +0000)]
Break out data passing events am: 67c21c423b

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

Change-Id: I5866b5a90d7a0cc7f844268edb2f488117028b84

3 years agoRe-order conditional stack/l2cap/l2c_link::l2c_link_send_to_lower am: bdb4bc4d69
Chris Manton [Sun, 23 Aug 2020 16:34:19 +0000 (16:34 +0000)]
Re-order conditional stack/l2cap/l2c_link::l2c_link_send_to_lower am: bdb4bc4d69

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

Change-Id: Ib97b5dd762aa2aa4ab6e9ac4ac936b0e6447bff4

3 years agoGroup controller acccess stack/l2cap/l2c_link::l2c_link_send_to_lower am: 1c3bc9cc69
Chris Manton [Sun, 23 Aug 2020 16:34:16 +0000 (16:34 +0000)]
Group controller acccess stack/l2cap/l2c_link::l2c_link_send_to_lower am: 1c3bc9cc69

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

Change-Id: Iad28310f46f52e943d83407778d2879ae4834a95

3 years agoColocate dec/def stack/l2cap/l2c_link::l2c_link_send_to_lower am: bd07b7ee83
Chris Manton [Sun, 23 Aug 2020 16:34:14 +0000 (16:34 +0000)]
Colocate dec/def stack/l2cap/l2c_link::l2c_link_send_to_lower am: bd07b7ee83

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

Change-Id: I6fb94921500c84c23d11e4ffdb8e92bf10e1822f

3 years agoEliminate useless stack vars l2c_link_send_to_lower_
Chris Manton [Sun, 23 Aug 2020 01:29:55 +0000 (18:29 -0700)]
Eliminate useless stack vars l2c_link_send_to_lower_

xmit_window
acl_data_size

Towards readability

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

3 years agoUse acl data passing API
Chris Manton [Sat, 22 Aug 2020 16:30:34 +0000 (09:30 -0700)]
Use acl data passing API

stack/l2cap/l2c_link::l2c_link_send_to_lower

Towards proper interfaces

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

3 years agoadd acl data passing API
Chris Manton [Sat, 22 Aug 2020 15:46:16 +0000 (08:46 -0700)]
add acl data passing API

stack/l2cap/l2c_link::l2c_link_send_to_lower

Towards proper interfaces

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

Change-Id: I48d067c679715e2fc6987347b92b8177fca9d512

3 years agoSmooth l2c_link_send_to_lower/br_edr and ble
Chris Manton [Sat, 22 Aug 2020 15:41:54 +0000 (08:41 -0700)]
Smooth l2c_link_send_to_lower/br_edr and ble

stack/l2cap/l2c_link::l2c_link_send_to_lower

Towards proper interfaces

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

Change-Id: Ia464ddf48f403d542f361b872c7c8a68c5de50af

3 years agoStreamline l2c_link_send_to_lower/br_edr and ble
Chris Manton [Sat, 22 Aug 2020 15:38:07 +0000 (08:38 -0700)]
Streamline l2c_link_send_to_lower/br_edr and ble

stack/l2cap/l2c_link::l2c_link_send_to_lower

Towards proper interfaces

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

Change-Id: I075af46d4f194fe44c5389b1ab5aa8341a3356ef

3 years agoBreak out l2c_link_send_to_lower into br_edr and ble
Chris Manton [Sat, 22 Aug 2020 15:31:48 +0000 (08:31 -0700)]
Break out l2c_link_send_to_lower into br_edr and ble

stack/l2cap/l2c_link::l2c_link_send_to_lower

Towards proper interfaces

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

Change-Id: Ia8c833a0ab806429743bd974d595cc102b738c5c

3 years agoAdd const stack/l2cap/l2c_link::l2c_link_send_to_lower
Chris Manton [Sat, 22 Aug 2020 15:26:49 +0000 (08:26 -0700)]
Add const stack/l2cap/l2c_link::l2c_link_send_to_lower

Pull out fit-in-buffer conditions

Towards proper interfaces

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

Change-Id: I861f7dc5eef2ee032a8e08c681ee5f18c7b5d277

3 years agoRemove def L2CAP_HCI_FLOW_CONTROL_DEBUG
Chris Manton [Fri, 21 Aug 2020 22:35:08 +0000 (15:35 -0700)]
Remove def L2CAP_HCI_FLOW_CONTROL_DEBUG

Towards readability

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

3 years agoBreak out data passing events
Chris Manton [Fri, 21 Aug 2020 22:23:58 +0000 (15:23 -0700)]
Break out data passing events

Towards readability

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

3 years agoRe-order conditional stack/l2cap/l2c_link::l2c_link_send_to_lower
Chris Manton [Fri, 21 Aug 2020 20:49:26 +0000 (13:49 -0700)]
Re-order conditional stack/l2cap/l2c_link::l2c_link_send_to_lower

Towards readability

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

3 years agoGroup controller acccess stack/l2cap/l2c_link::l2c_link_send_to_lower
Chris Manton [Fri, 21 Aug 2020 17:17:44 +0000 (10:17 -0700)]
Group controller acccess stack/l2cap/l2c_link::l2c_link_send_to_lower

Also add transport and link_xmit_quota

Towards proper interfaces

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

3 years agoColocate dec/def stack/l2cap/l2c_link::l2c_link_send_to_lower
Chris Manton [Fri, 21 Aug 2020 17:08:52 +0000 (10:08 -0700)]
Colocate dec/def stack/l2cap/l2c_link::l2c_link_send_to_lower

Towards proper interfaces

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

3 years agoMerge "GD-Cert: Override parameters during cert test" am: e1aad0ff93
Treehugger Robot [Sat, 22 Aug 2020 02:01:31 +0000 (02:01 +0000)]
Merge "GD-Cert: Override parameters during cert test" am: e1aad0ff93

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

Change-Id: I862ec8fd973be68dd8f468d49745f4808530c9fa

3 years agoMerge "GD-Cert: Override parameters during cert test"
Treehugger Robot [Sat, 22 Aug 2020 01:35:39 +0000 (01:35 +0000)]
Merge "GD-Cert: Override parameters during cert test"

3 years agoRefactor: Fix BT device name length issue am: 624c787a77
xiaoshun.xu [Sat, 22 Aug 2020 01:15:00 +0000 (01:15 +0000)]
Refactor: Fix BT device name length issue am: 624c787a77

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

Change-Id: Id27936b443e58edc6878de983494741ecb9c8d75

3 years agoGD-Cert: Override parameters during cert test
Jack He [Fri, 21 Aug 2020 23:46:19 +0000 (16:46 -0700)]
GD-Cert: Override parameters during cert test

* Allow overriding system properties and paramters
  at runtime
* Override them into right values during cert testing to
  allow output collection

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

3 years agoRefactor: Fix BT device name length issue
xiaoshun.xu [Tue, 18 Aug 2020 17:57:09 +0000 (01:57 +0800)]
Refactor: Fix BT device name length issue

BT device name only show 247bytes on settings, it supposed to show
248bytes if local device and remote device have 248bytes' name.
Increasing the argument passed to function strlcpy&memcpy bt 1
will resolve the issue.

Tag: #refactor
Bug: 162480697
Sponsor: mylesgw
Test: cert/run --host
Change-Id: Ib3fa7d78e39f0a9330658f9ce2b4a67003d7114d