OSDN Git Service

android-x86/system-bt.git
3 years agoAdd API stack/btm/btm_ble::btm_ble_connected_from_address_with_type
Chris Manton [Thu, 27 Aug 2020 16:44:19 +0000 (09:44 -0700)]
Add API stack/btm/btm_ble::btm_ble_connected_from_address_with_type

Towards readable code

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

3 years agoStreamline stack/btm/btm_ble::btm_ble_connected
Chris Manton [Thu, 27 Aug 2020 04:45:19 +0000 (21:45 -0700)]
Streamline stack/btm/btm_ble::btm_ble_connected

Towards readable code

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

3 years agoAdd gd acl init flag
Chris Manton [Wed, 19 Aug 2020 20:36:54 +0000 (13:36 -0700)]
Add gd acl init flag

Tag: #gd-refactor
Bug: 159815595
Test: cert/run --host
Change-Id: If8344697c48a4a68eeb7606905c1d3b14e3da43a

3 years agoMerge "Remove unnecessary command check"
Treehugger Robot [Mon, 31 Aug 2020 03:49:46 +0000 (03:49 +0000)]
Merge "Remove unnecessary command check"

3 years agoRemove unnecessary command check
Chris Manton [Sun, 30 Aug 2020 18:58:51 +0000 (11:58 -0700)]
Remove unnecessary command check

Test fix complements
https://android-review.googlesource.com/c/platform/system/bt/+/1409768

Bug: 155399771
Test: bluetooth_test_gd
--gtest_filter=LeExtendedAdvertisingManagerTest.create_advertiser_tes
Tag: #gd-refactor

Change-Id: I19f37f82624c4daaeea6a2e8f61fdd92ea442d4a

3 years agoAdd new api stack/acl/ble_acl::acl_ble__complete
Chris Manton [Thu, 27 Aug 2020 18:45:27 +0000 (11:45 -0700)]
Add new api stack/acl/ble_acl::acl_ble__complete

Towards readable code

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

3 years agoRemove unused defs
Chris Manton [Thu, 27 Aug 2020 00:58:37 +0000 (17:58 -0700)]
Remove unused defs

Towards readable code

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

3 years agoRemove tBT_TRANSPORT from acl_refresh_remote_address
Chris Manton [Thu, 27 Aug 2020 17:08:07 +0000 (10:08 -0700)]
Remove tBT_TRANSPORT from acl_refresh_remote_address

By definition this always requires LE transport

Towards readable code

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

3 years agoenum-ify tBTM_BLE_CONN_ST
Chris Manton [Sun, 30 Aug 2020 03:47:05 +0000 (20:47 -0700)]
enum-ify tBTM_BLE_CONN_ST

Towards readable code

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

3 years agoAdd helpers to stack/include/bt_types::tBLE_BD_ADDR
Chris Manton [Thu, 27 Aug 2020 22:33:39 +0000 (15:33 -0700)]
Add helpers to stack/include/bt_types::tBLE_BD_ADDR

Towards readable code

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

3 years agoMerge "role is unused"
Treehugger Robot [Sat, 29 Aug 2020 04:16:22 +0000 (04:16 +0000)]
Merge "role is unused"

3 years agoCreate stack/include/ble_hci_link_interface
Chris Manton [Thu, 27 Aug 2020 00:53:57 +0000 (17:53 -0700)]
Create stack/include/ble_hci_link_interface

Towards proper interfaces

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

3 years agoRemove unused defs TRACE_ stack/include/bt_types.h
Chris Manton [Fri, 28 Aug 2020 23:34:22 +0000 (16:34 -0700)]
Remove unused defs TRACE_ stack/include/bt_types.h

Towards readable code

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

3 years agoMove def BLE_ADDR_TYPE_ID_BIT closer to relatives
Chris Manton [Fri, 28 Aug 2020 22:24:00 +0000 (15:24 -0700)]
Move def BLE_ADDR_TYPE_ID_BIT closer to relatives

Towards readable code

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

3 years agoRemove unused defs BLE_ADDR_IS_STATIC
Chris Manton [Fri, 28 Aug 2020 21:40:32 +0000 (14:40 -0700)]
Remove unused defs BLE_ADDR_IS_STATIC

And:
PHY_LE_1M_MASK
PHY_LE_2M_MASK
PHY_LE_CODED_MASK
BLE_ADDR_TYPE_MASK

Towards readable code

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

3 years agoUse local constant for service/low_energy_client
Chris Manton [Fri, 28 Aug 2020 21:42:50 +0000 (14:42 -0700)]
Use local constant for service/low_energy_client

PHY_LE_1M_MASK

Towards readable code

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

3 years agorole is unused
Hansong Zhang [Fri, 28 Aug 2020 21:14:12 +0000 (14:14 -0700)]
role is unused

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

3 years agoL2CA_SetIdleTimeout is unused
Hansong Zhang [Fri, 28 Aug 2020 20:14:15 +0000 (13:14 -0700)]
L2CA_SetIdleTimeout is unused

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

3 years agop_tcb->att_lcid is always L2CAP_ATT_CID
Hansong Zhang [Fri, 28 Aug 2020 20:12:26 +0000 (13:12 -0700)]
p_tcb->att_lcid is always L2CAP_ATT_CID

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

3 years agoL2CAP_HIGH_PRI_CHAN_QUOTA_IS_CONFIGURABLE is unused
Hansong Zhang [Fri, 28 Aug 2020 18:06:55 +0000 (11:06 -0700)]
L2CAP_HIGH_PRI_CHAN_QUOTA_IS_CONFIGURABLE is unused

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

3 years agoRemove unused code in bta_sys.h
Hansong Zhang [Fri, 28 Aug 2020 07:20:07 +0000 (00:20 -0700)]
Remove unused code in bta_sys.h

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

3 years agono_smp_on_br is never true
Hansong Zhang [Fri, 28 Aug 2020 07:08:20 +0000 (00:08 -0700)]
no_smp_on_br is never true

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

3 years agoRemove unused code in l2c_api.h
Hansong Zhang [Thu, 27 Aug 2020 23:06:00 +0000 (16:06 -0700)]
Remove unused code in l2c_api.h

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

3 years agop_nocp_cb is never set
Hansong Zhang [Thu, 27 Aug 2020 23:04:04 +0000 (16:04 -0700)]
p_nocp_cb is never set

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

3 years agopL2CA_CreditsReceived_Cb is no longer useful
Hansong Zhang [Thu, 27 Aug 2020 22:53:42 +0000 (15:53 -0700)]
pL2CA_CreditsReceived_Cb is no longer useful

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

3 years agogap_credits_received_cb is no longer useful
Hansong Zhang [Thu, 27 Aug 2020 22:52:47 +0000 (15:52 -0700)]
gap_credits_received_cb is no longer useful

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

3 years agoHearing aid doesn't care about credit received event
Hansong Zhang [Thu, 27 Aug 2020 22:51:46 +0000 (15:51 -0700)]
Hearing aid doesn't care about credit received event

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

3 years agoRemove remaining fixed channel code in bta_jv
Hansong Zhang [Thu, 27 Aug 2020 22:47:51 +0000 (15:47 -0700)]
Remove remaining fixed channel code in bta_jv

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

3 years agoRemove unused fixed channel related stuff
Hansong Zhang [Thu, 27 Aug 2020 22:39:35 +0000 (15:39 -0700)]
Remove unused fixed channel related stuff

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

3 years agoRemove unused code
Hansong Zhang [Thu, 27 Aug 2020 22:31:12 +0000 (15:31 -0700)]
Remove unused code

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

3 years agosock->fixed_chan is always false
Hansong Zhang [Thu, 27 Aug 2020 22:29:36 +0000 (15:29 -0700)]
sock->fixed_chan is always false

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

3 years agosock->fixed_chane is always false, and remove unused code
Hansong Zhang [Thu, 27 Aug 2020 22:25:31 +0000 (15:25 -0700)]
sock->fixed_chane is always false, and remove unused code

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

3 years agobta_jv_l2cap_connect_le is unused
Hansong Zhang [Thu, 27 Aug 2020 22:22:36 +0000 (15:22 -0700)]
bta_jv_l2cap_connect_le is unused

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

3 years agoRemove l2cap fixed channel socket
Hansong Zhang [Thu, 27 Aug 2020 22:18:00 +0000 (15:18 -0700)]
Remove l2cap fixed channel socket

The spec says in LE only ATT and SMP use fixed channel, and in classic
only SMP_BR uses fixed channel. Don't expose the socket API to java.

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

3 years agoClean up L2cap usage of btm_int
Hansong Zhang [Wed, 26 Aug 2020 23:20:21 +0000 (16:20 -0700)]
Clean up L2cap usage of btm_int

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

3 years agoMerge "Convert gap_connections to new l2cap + security"
Treehugger Robot [Thu, 27 Aug 2020 00:39:25 +0000 (00:39 +0000)]
Merge "Convert gap_connections to new l2cap + security"

3 years agoConvert gap_connections to new l2cap + security
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

3 years agoRe-include stack/btu/btu_hcif
Chris Manton [Wed, 26 Aug 2020 22:08:25 +0000 (15:08 -0700)]
Re-include stack/btu/btu_hcif

Towards readable code

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

Change-Id: I503a60a4bc6693ddd1a4a177eff3e1fd4926d5b3

3 years agostack/acl/btm_acl::BTM_GetRole
Chris Manton [Wed, 26 Aug 2020 17:26:45 +0000 (10:26 -0700)]
stack/acl/btm_acl::BTM_GetRole

Towards readable code

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

3 years agoStreamline stack/acl/btm_acl::BTM_SwitchRole
Chris Manton [Wed, 26 Aug 2020 17:32:26 +0000 (10:32 -0700)]
Streamline stack/acl/btm_acl::BTM_SwitchRole

Towards readable code

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

3 years agoStreamline stack/acl/btm_acl::btm_acl_removed
Chris Manton [Wed, 26 Aug 2020 17:20:16 +0000 (10:20 -0700)]
Streamline stack/acl/btm_acl::btm_acl_removed

Towards readable code

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

3 years agoRe-include stack/btm/btm_ble
Chris Manton [Wed, 26 Aug 2020 17:48:48 +0000 (10:48 -0700)]
Re-include stack/btm/btm_ble

Towards readable code

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

3 years agoMerge "Make GD LeSecurityTest pass on real devices"
Treehugger Robot [Wed, 26 Aug 2020 22:55:04 +0000 (22:55 +0000)]
Merge "Make GD LeSecurityTest pass on real devices"

3 years agoMake GD LeSecurityTest pass on real devices
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

3 years agoMerge changes I6e42378e,I04ab0633,I97318502
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

3 years agoMerge changes I01baf211,I320b9709,I4045258b,I7d09393f,I7e983860
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

3 years agoMerge "GD-Cert: Add btconfig parameter to real device test"
Treehugger Robot [Wed, 26 Aug 2020 20:04:54 +0000 (20:04 +0000)]
Merge "GD-Cert: Add btconfig parameter to real device test"

3 years agoMerge "Fuzzer for g722 encoder"
Treehugger Robot [Wed, 26 Aug 2020 18:32:44 +0000 (18:32 +0000)]
Merge "Fuzzer for g722 encoder"

3 years agoremove def stack/acl/btm_pm::BTM_SSR_INCLUDED
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

3 years agoEncapsulate tACL_CB::tACL_CONN::switch_role_state
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

3 years agoEnacpsulate tACL_CB::tACL_CONN::encrypt_state
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

3 years agoUse API from stack/btu/btu_hcif::l2c_link_role_changed
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

3 years agoSlightly Streamline l2c_link_hci_conn_comp
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

3 years agoGD-Cert: Add btconfig parameter to real device test
Jack He [Wed, 26 Aug 2020 18:11:46 +0000 (11:11 -0700)]
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

3 years agoMerge "RootCanal: Reset the model in BluetoothHci::close"
Treehugger Robot [Wed, 26 Aug 2020 17:57:44 +0000 (17:57 +0000)]
Merge "RootCanal: Reset the model in BluetoothHci::close"

3 years agoMerge changes Ic28ba99f,I353efe8c,I2c0908fd,I860b744c,Icc9ad82c
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

3 years agoRootCanal: Reset the model in BluetoothHci::close
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

3 years agoMerge changes I5b76ec20,I11c768ec,I36a436de,I7b30020b,Ie6b729f1, ...
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

3 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

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

3 years agoRemove BTM_SimpleSetSecurityLevel
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

3 years agoMigrate GATT security
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

3 years agoMigrate SDP to L2CA_ConnectReq2
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

3 years agogoodbye BTM_SetOutService
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

3 years agoInline BNEP security
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

3 years agoRemove more vestiges of PAN GN
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

3 years agoPan role is never GN
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

3 years agoSimplify PAN role setting
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

3 years agobtpan_enable is never called from JNI
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

3 years agoRemove stray out service call
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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

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

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

3 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

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

3 years agoRemove bta knowledge of hci handle
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

3 years agoStreamline bta/dm/::bta_dm_acl_up/down
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

3 years agoAdd API stack/acl/btm_acl::acl_peer_supports_sniff_subrating
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

3 years agoRemove def bta/dm/BTM_SSR_INCLUDED
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

3 years agoRework api ret val BTA_DmGetConnectionState
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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

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 agoFuzzer for g722 encoder
dakshesh [Tue, 18 Aug 2020 15:19:04 +0000 (15:19 +0000)]
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

3 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

3 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

3 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

3 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