OSDN Git Service

android-x86/system-bt.git
3 years agoMerge "HCI PDL: Fix formatting with spaces" am: bbcee0582f
Treehugger Robot [Thu, 11 Mar 2021 23:14:19 +0000 (23:14 +0000)]
Merge "HCI PDL: Fix formatting with spaces" am: bbcee0582f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88b78ae4bc92386dd028677f1d9b414d52df21d0

3 years agoMerge "HCI PDL: Fix formatting with spaces"
Treehugger Robot [Thu, 11 Mar 2021 22:53:00 +0000 (22:53 +0000)]
Merge "HCI PDL: Fix formatting with spaces"

3 years agoMerge "Unbind cert_self_test from ACTS" am: b98ae0fcc1
Jizheng Chu [Thu, 11 Mar 2021 22:23:14 +0000 (22:23 +0000)]
Merge "Unbind cert_self_test from ACTS" am: b98ae0fcc1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7b4be44a167319cfa2c9deb6f4e3fe81194fb67

3 years agoShim Scanning: Update address type and device type to storage am: 2d7a4e404b
Chienyuan [Thu, 11 Mar 2021 22:21:55 +0000 (22:21 +0000)]
Shim Scanning: Update address type and device type to storage am: 2d7a4e404b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c81a579e9c72e5315bbbf249bd0ebec2ecef87b

3 years agoMerge "Unbind cert_self_test from ACTS"
Jizheng Chu [Thu, 11 Mar 2021 21:42:47 +0000 (21:42 +0000)]
Merge "Unbind cert_self_test from ACTS"

3 years agoHCI PDL: Fix formatting with spaces
Myles Watson [Tue, 9 Mar 2021 21:57:18 +0000 (13:57 -0800)]
HCI PDL: Fix formatting with spaces

Bug: 182216573
Test: atest bluetooth_test_gd
      libbt_packets_test
Tag: #gd-refactor
Change-Id: Ifd4d681fe95664cec639bab800bec73c26b1d3a4

3 years agoShim Scanning: Update address type and device type to storage
Chienyuan [Thu, 11 Mar 2021 11:39:08 +0000 (19:39 +0800)]
Shim Scanning: Update address type and device type to storage

Tag: #gd-refactor
Bug: 182243613
Test: gd/cert/run
Test: manual, pair LE device with public address
Change-Id: I8a9a0873dbdf4e8fd85f12ae7f0b2d911f5a47dc

3 years agoMerge "rusty-gd: Use a sequenced runner to post closures." am: d8a0789c9f
Qasim Javed [Thu, 11 Mar 2021 02:50:27 +0000 (02:50 +0000)]
Merge "rusty-gd: Use a sequenced runner to post closures." am: d8a0789c9f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7af376c6654c4cbff1765b2e784f289e2f6aa28

3 years agoGD: Open a pid file when stack is running am: 29f06a0604
Hansong Zhang [Thu, 11 Mar 2021 02:41:42 +0000 (02:41 +0000)]
GD: Open a pid file when stack is running am: 29f06a0604

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie78420369dc9de586182f8a5196adcb8c7bcff2f

3 years agoMerge "rusty-gd: Use a sequenced runner to post closures."
Qasim Javed [Thu, 11 Mar 2021 01:59:20 +0000 (01:59 +0000)]
Merge "rusty-gd: Use a sequenced runner to post closures."

3 years agoGD: Open a pid file when stack is running
Hansong Zhang [Thu, 4 Mar 2021 02:08:42 +0000 (18:08 -0800)]
GD: Open a pid file when stack is running

So that some other manager process can detect it

Test: cert/run
Bug: 181590011
Tag: #refactor
Change-Id: I340b5d25b4374d47c8c769d80fcd287b23696202

3 years agorusty-gd: Use a sequenced runner to post closures.
Qasim Javed [Tue, 9 Mar 2021 21:30:01 +0000 (13:30 -0800)]
rusty-gd: Use a sequenced runner to post closures.

With this, I am able to reconnect to Pixel Buds successfully.

Previously, there was a crash due CHECK(ThreadTaskRunner::IsSet())
failing.

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost DirectHciTest

Change-Id: I43ad40b03a63bdec5284c584216671bd3ae20376

3 years agoMerge "Remove log.h from mock file" am: 8a65a1b9eb
Weichin Weng [Wed, 10 Mar 2021 02:35:21 +0000 (02:35 +0000)]
Merge "Remove log.h from mock file" am: 8a65a1b9eb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4420b75a2b1777877b23630da4872f06cfa2347

3 years agoMove Common Criteria mode dependency to Android only. am: 5bfacc5f8c
weichinweng [Wed, 10 Mar 2021 02:34:30 +0000 (02:34 +0000)]
Move Common Criteria mode dependency to Android only. am: 5bfacc5f8c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2339d457d2c098349cd6835b7b1b1fea6aa83051

3 years agoMerge "Remove log.h from mock file"
Weichin Weng [Wed, 10 Mar 2021 02:04:26 +0000 (02:04 +0000)]
Merge "Remove log.h from mock file"

3 years agoMove Common Criteria mode dependency to Android only.
weichinweng [Fri, 5 Mar 2021 06:12:09 +0000 (14:12 +0800)]
Move Common Criteria mode dependency to Android only.

Bug: 181293964
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: I92deb21350f9ec963d7d5985aed31563b7384bbd

3 years agoRemove log.h from mock file
weichinweng [Mon, 8 Mar 2021 12:08:30 +0000 (20:08 +0800)]
Remove log.h from mock file

Bug: 181293964
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: I89356bb39fa0fe5cc70d8ee17a28699275a32126

3 years agoMerge "Fix handshaking error between HCI driver and rootcanal" am: 82acd1a392
JaeMan Park [Wed, 10 Mar 2021 00:49:08 +0000 (00:49 +0000)]
Merge "Fix handshaking error between HCI driver and rootcanal" am: 82acd1a392

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If921000ab7e534ada5e8c16a03f822dc9b1ec277

3 years agoMerge "Fix handshaking error between HCI driver and rootcanal"
JaeMan Park [Wed, 10 Mar 2021 00:04:51 +0000 (00:04 +0000)]
Merge "Fix handshaking error between HCI driver and rootcanal"

3 years agoMerge "Revert "Put stack vars in proper scope"" am: ff6d325cda
Chris Manton [Tue, 9 Mar 2021 22:29:21 +0000 (22:29 +0000)]
Merge "Revert "Put stack vars in proper scope"" am: ff6d325cda

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0721a85ab199a761050dd2f90cdaf5ad1d943022

3 years agoMerge changes I40975081,Ia1fe07b4,Ieffc9874 am: bfae0fd73a
Myles Watson [Tue, 9 Mar 2021 22:28:09 +0000 (22:28 +0000)]
Merge changes I40975081,Ia1fe07b4,Ieffc9874 am: bfae0fd73a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6689f62921bae025008683958545ea7fd1c79cb

3 years agoMerge "Revert "Put stack vars in proper scope""
Chris Manton [Tue, 9 Mar 2021 22:13:27 +0000 (22:13 +0000)]
Merge "Revert "Put stack vars in proper scope""

3 years agoMerge changes I40975081,Ia1fe07b4,Ieffc9874
Myles Watson [Tue, 9 Mar 2021 22:08:18 +0000 (22:08 +0000)]
Merge changes I40975081,Ia1fe07b4,Ieffc9874

* changes:
  PDL: Add example test packets
  Rust: Add a packet test
  PDL: Add support for test

3 years agoRevert "Put stack vars in proper scope"
Chris Manton [Tue, 9 Mar 2021 20:36:21 +0000 (12:36 -0800)]
Revert "Put stack vars in proper scope"

Bug: 182259591
Test: Builds and compiles
Tag: #refactor

This reverts commit 3318a1ce16a4fdb3d7a2c4bfc4e9dfe407839d3f.

Change-Id: I25771c2c40089fc46ebce256c0ae1344ac6af2c4

3 years agoSend response as combined form am: 1a93288cf4
Jeongik Cha [Tue, 9 Mar 2021 15:04:13 +0000 (15:04 +0000)]
Send response as combined form am: 1a93288cf4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdd41315914d4e230911217ecaec729e90853241

3 years agoSend response as combined form
Jeongik Cha [Tue, 9 Mar 2021 05:41:07 +0000 (14:41 +0900)]
Send response as combined form

As-is: root-canal's response consists of packet type and payload
separately

In the case of several request in parallel, the responses could be
overlapped, so make it combined to avoid the situation.

Test: atest AdapterServiceTest
Bug: 182167189
Change-Id: I19b99f6399777e927b81c26366d8e02ae577936e

3 years agoMerge "Add metric_id_manager to GD using existing Address and LruCache of GD" am...
Chen Chen [Tue, 9 Mar 2021 02:37:23 +0000 (02:37 +0000)]
Merge "Add metric_id_manager to GD using existing Address and LruCache of GD" am: c6eb363d17

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I538bc191faabe9d7c38d46d1c7b15a3cfe372753

3 years agoMerge "Add metric_id_manager to GD using existing Address and LruCache of GD"
Chen Chen [Tue, 9 Mar 2021 01:58:42 +0000 (01:58 +0000)]
Merge "Add metric_id_manager to GD using existing Address and LruCache of GD"

3 years agoPDL: Add example test packets
Myles Watson [Tue, 9 Mar 2021 00:38:57 +0000 (16:38 -0800)]
PDL: Add example test packets

Bug: 182216573
Test: atest libbt_packets_test
Tag: #gd-refactor
Change-Id: I40975081d5d30f7078a432df94b9d0c58410da97

3 years agoRust: Add a packet test
Myles Watson [Tue, 9 Mar 2021 00:37:55 +0000 (16:37 -0800)]
Rust: Add a packet test

Bug: 182216573
Test: atest libbt_packets_test
Tag: #gd-refactor
Change-Id: Ia1fe07b49363b166d164811dd9aaceea05e66d48

3 years agoPDL: Add support for test
Myles Watson [Tue, 9 Mar 2021 00:51:50 +0000 (16:51 -0800)]
PDL: Add support for test

Bug: 182216573
Test: atest libbt_packets_test
Tag: #gd-refactor
Change-Id: Ieffc9874c0ff17cb2a0acb5e9399b6222f585f7c

3 years agoMerge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ... am: 28e8caaba8
Chris Manton [Tue, 9 Mar 2021 00:41:51 +0000 (00:41 +0000)]
Merge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ... am: 28e8caaba8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I989c6bef6cf54667e59f9060e2a53455c5caffde

3 years agoMerge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ...
Chris Manton [Tue, 9 Mar 2021 00:19:34 +0000 (00:19 +0000)]
Merge changes Ib81960bb,I1d84f463,Id475e310,I4ba9755c,Ib6f7b4ba, ...

* changes:
  Introduce main_shim_test
  Add main/test::shim mocks
  Add gd/neighbor::inquiry mock
  Add SCO HACK for shim acl mock
  Add gd/hci::controller mock
  gd_acl: Directly access acl manager for SCO hack
  Put stack vars in proper scope
  Return proper type stack/acl/btm_pm::BTM_SetPowerMode
  Explicitly specify status type include/hardware/ble_scanner.h
  Add stack init indirection for activity_attribution
  Use proper tBTM_STATUS types
  Use tBTM_STATUS in stack/l2cap/::
  gd_shim: Log more info about acl queue state
  Add bta_sys post to main alternative method
  Remove unused field srvc_id
  Template prep for bta hardening
  Use btm_status in stack/rfcomm/::
  Use proper types tBLE_SCAN_MODE
  User proper types tBTM_STATUS
  Canonicalize tBTM_APPL_INFO::bta_security
  Streamline bta_av_link_role_ok
  Use canonical include paths
  Add hci code conversion stack/include/hci_error_code
  Remove unused bta/include/bta_api::#defs
  Remove unused API BTM_GetPeerSCA
  Remove unused API BTM_RequestPeerSCA
  Remove unused API BTM_IsPhy2mSupported
  Properly conform tACL_CONN field names
  Add stack/include::BT_HDR rigid struct
  Use proper types tSMP_STATUS
  Properly type stack/smp::tSMP_EVT
  Remove useless extern keyword for definitions
  Remove unused stack/gatt/gatt_int::#defs
  Re-include bta/ag/bta_ag_sdp.cc

3 years agoAdd a way to connect to linux raw HCI HAL am: 6453e4a8e3
Hansong Zhang [Mon, 8 Mar 2021 23:57:24 +0000 (23:57 +0000)]
Add a way to connect to linux raw HCI HAL am: 6453e4a8e3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I057fa24bc1560f60ee8d6281278870a6ba5601e5

3 years agoAdd a way to connect to linux raw HCI HAL
Hansong Zhang [Wed, 3 Mar 2021 23:55:37 +0000 (15:55 -0800)]
Add a way to connect to linux raw HCI HAL

Tag: #refactor
Bug: 181590011
Test: cert/run
Change-Id: I5308fd604b091392b9a8b15154732afeb03dde57

3 years agoIntroduce main_shim_test
Chris Manton [Fri, 5 Mar 2021 20:25:19 +0000 (12:25 -0800)]
Introduce main_shim_test

Bug: 181991662
Test: gd/cert/run
Tag: #refactor

Change-Id: Ib81960bb3065f3964be16ba0feaf22358be8f323

3 years agoAdd main/test::shim mocks
Chris Manton [Fri, 5 Mar 2021 02:53:07 +0000 (18:53 -0800)]
Add main/test::shim mocks

Bug: 181991662
Test: gd/cert/run
Tag: #refactor
No-Typo-Check: Legacy misnamed code

Change-Id: I1d84f463fe1a126f1cc685b10f77f4872088a78d

3 years agoAdd gd/neighbor::inquiry mock
Chris Manton [Fri, 5 Mar 2021 02:52:31 +0000 (18:52 -0800)]
Add gd/neighbor::inquiry mock

Bug: 181991662
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Id475e31092c884b33bd92b4ee18ff53b7c4d4a03

3 years agoAdd SCO HACK for shim acl mock
Chris Manton [Fri, 5 Mar 2021 22:47:01 +0000 (14:47 -0800)]
Add SCO HACK for shim acl mock

Bug: 181991662
Test: gd/cert/run
Tag: #refactor
Change-Id: I4ba9755c6f482c99bbbc0bd55de22d45d8949815

3 years agoAdd gd/hci::controller mock
Chris Manton [Fri, 5 Mar 2021 02:52:21 +0000 (18:52 -0800)]
Add gd/hci::controller mock

Bug: 181991662
Test: cert
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ib6f7b4bada0ae673842f134dc5eb22d9b2bf422d

3 years agogd_acl: Directly access acl manager for SCO hack
Chris Manton [Fri, 5 Mar 2021 16:35:18 +0000 (08:35 -0800)]
gd_acl: Directly access acl manager for SCO hack

Also explicitly log SCO disconnect

Bug: 179649871
Test: gd/cert/run
Tag: #refactor

Change-Id: Ia8fb5408d909c02d01bac5057dd388e1d8909e63

3 years agoPut stack vars in proper scope
Chris Manton [Wed, 3 Mar 2021 01:03:12 +0000 (17:03 -0800)]
Put stack vars in proper scope

Toward refactor-able code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ied75ac91e075d9072875b34f91d91c1191473215

3 years agoReturn proper type stack/acl/btm_pm::BTM_SetPowerMode
Chris Manton [Mon, 1 Mar 2021 18:34:01 +0000 (10:34 -0800)]
Return proper type stack/acl/btm_pm::BTM_SetPowerMode

Toward type safe code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ifdd3fcbd0c149f5d5a8987f6e0a15210d8a6cdc8

3 years agoExplicitly specify status type include/hardware/ble_scanner.h
Chris Manton [Mon, 1 Mar 2021 18:33:30 +0000 (10:33 -0800)]
Explicitly specify status type include/hardware/ble_scanner.h

Toward readable code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ifec58b3e95fe9414b27f1199551b7cb65982ca0b

3 years agoAdd stack init indirection for activity_attribution
Chris Manton [Fri, 5 Mar 2021 21:51:43 +0000 (13:51 -0800)]
Add stack init indirection for activity_attribution

Conforms to peers and is more testable

Bug: 181991662
Test: cert
Tag: #refactor
Change-Id: Ib01c3b35ee5bb0deb370cbbee4d8e88929beb4dc

3 years agoUse proper tBTM_STATUS types
Chris Manton [Tue, 2 Mar 2021 21:30:20 +0000 (13:30 -0800)]
Use proper tBTM_STATUS types

Toward readable code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I7727220d4da93279ed215fa366b528cc859b8525

3 years agoUse tBTM_STATUS in stack/l2cap/::
Chris Manton [Mon, 1 Mar 2021 17:32:24 +0000 (09:32 -0800)]
Use tBTM_STATUS in stack/l2cap/::

Toward meaningful code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I588780b8301474b01c2c9f52e3d9c2c1b9fdd937

3 years agogd_shim: Log more info about acl queue state
Chris Manton [Thu, 4 Mar 2021 05:46:43 +0000 (21:46 -0800)]
gd_shim: Log more info about acl queue state

Bug: 179649871
Test: cert
Tag: #refactor

Change-Id: I8aaae60224afa28477d8a556ec11b11df06fa5c0

3 years agoAdd bta_sys post to main alternative method
Chris Manton [Wed, 3 Mar 2021 21:46:20 +0000 (13:46 -0800)]
Add bta_sys post to main alternative method

Toward eliminating BTA sys

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Id6b12b2d9744929ebb344fc1caf20c6a8015a525

3 years agoRemove unused field srvc_id
Chris Manton [Wed, 3 Mar 2021 21:45:40 +0000 (13:45 -0800)]
Remove unused field srvc_id

Toward meaningful code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I3dcaf1e3acacb2fe7754c24c3fd383ddce03bf69

3 years agoTemplate prep for bta hardening
Chris Manton [Mon, 8 Mar 2021 18:05:41 +0000 (10:05 -0800)]
Template prep for bta hardening

Syntactic sugar to wrangle next Union battle

Towards readable code

Bug: 163134718
Test: cert
Tag: #refactor
Change-Id: I5921b2ab188f1062b0c1ad19bf9e2d0e2c8017db

3 years agoUse btm_status in stack/rfcomm/::
Chris Manton [Mon, 1 Mar 2021 17:32:01 +0000 (09:32 -0800)]
Use btm_status in stack/rfcomm/::

Toward readable code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I2e15fca337cbec3e265b7945d59a2fdbb6d178d5

3 years agoUse proper types tBLE_SCAN_MODE
Chris Manton [Wed, 3 Mar 2021 01:03:01 +0000 (17:03 -0800)]
Use proper types tBLE_SCAN_MODE

Toward readable code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I740140779cea143d829d137d8cb8dff4748489cc

3 years agoUser proper types tBTM_STATUS
Chris Manton [Wed, 3 Mar 2021 01:02:42 +0000 (17:02 -0800)]
User proper types tBTM_STATUS

Toward readable code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I495d4d13dfbac92b80c83223687b99763c9381a5

3 years agoCanonicalize tBTM_APPL_INFO::bta_security
Chris Manton [Sun, 28 Feb 2021 07:08:57 +0000 (23:08 -0800)]
Canonicalize tBTM_APPL_INFO::bta_security

Toward readable code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I52cb204abc1b6e42c7239c25211e87772c7c1b8d

3 years agoStreamline bta_av_link_role_ok
Chris Manton [Sun, 28 Feb 2021 04:52:00 +0000 (20:52 -0800)]
Streamline bta_av_link_role_ok

Toward readable code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ic559c133134392b6123a292e991ef933080cb043

3 years agoUse canonical include paths
Chris Manton [Thu, 4 Mar 2021 05:47:09 +0000 (21:47 -0800)]
Use canonical include paths

Toward readable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: I5248569747177e3bb169509e34c7053145bfbfda

3 years agoAdd hci code conversion stack/include/hci_error_code
Chris Manton [Mon, 1 Mar 2021 21:54:35 +0000 (13:54 -0800)]
Add hci code conversion stack/include/hci_error_code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ib3aadbecc039df43b6fc6bf4cc603674ecf6b4c0

3 years agoRemove unused bta/include/bta_api::#defs
Chris Manton [Wed, 3 Mar 2021 01:55:28 +0000 (17:55 -0800)]
Remove unused bta/include/bta_api::#defs

Toward meaningful code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I46b2473c22ea1cf9f111f768d47263c19d2249ae

3 years agoRemove unused API BTM_GetPeerSCA
Chris Manton [Sun, 28 Feb 2021 04:20:44 +0000 (20:20 -0800)]
Remove unused API BTM_GetPeerSCA

Toward meaningful code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I5050817e500d33265ecd8bfc9ec2b547ab0ff625

3 years agoRemove unused API BTM_RequestPeerSCA
Chris Manton [Sun, 28 Feb 2021 04:18:04 +0000 (20:18 -0800)]
Remove unused API BTM_RequestPeerSCA

Toward meaningful code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I2bacaee6f567d717065cab643a249072645bc0ba

3 years agoRemove unused API BTM_IsPhy2mSupported
Chris Manton [Sun, 28 Feb 2021 04:14:33 +0000 (20:14 -0800)]
Remove unused API BTM_IsPhy2mSupported

Toward meaningful code

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I3ea1d0538678f7617b8a485c9430ecd0e43741e9

3 years agoProperly conform tACL_CONN field names
Chris Manton [Fri, 5 Mar 2021 00:50:53 +0000 (16:50 -0800)]
Properly conform tACL_CONN field names

And put getters in header

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I544de67b543b272485e8993fc609288703c16bbf

3 years agoAdd stack/include::BT_HDR rigid struct
Chris Manton [Thu, 4 Mar 2021 22:27:37 +0000 (14:27 -0800)]
Add stack/include::BT_HDR rigid struct

Missing the dreaded flexible array member which is embedded
in the middle of so many larger structs

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I7c4f92221b25dc93e6165ed7ab1991529ffc1539

3 years agoUse proper types tSMP_STATUS
Chris Manton [Tue, 2 Mar 2021 17:49:50 +0000 (09:49 -0800)]
Use proper types tSMP_STATUS

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ie0851299d1d4467c4beb60b73405269cf174036a

3 years agoProperly type stack/smp::tSMP_EVT
Chris Manton [Tue, 2 Mar 2021 20:32:50 +0000 (12:32 -0800)]
Properly type stack/smp::tSMP_EVT

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I9a8cc028eaf994b9b8b94d62ddaae05f4cb038e8

3 years agoAdd metric_id_manager to GD using existing Address and LruCache of GD
Chen Chen [Fri, 5 Mar 2021 00:23:47 +0000 (16:23 -0800)]
Add metric_id_manager to GD using existing Address and LruCache of GD

Test: atest bluetooth_test_gd
Bug: 181819141
Change-Id: I5c4217f91f3bc14dec99486d83353d27fc69c630

3 years agoRemove useless extern keyword for definitions
Chris Manton [Thu, 4 Mar 2021 05:41:15 +0000 (21:41 -0800)]
Remove useless extern keyword for definitions

Messes up my tools

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ic088b46d71dceadbb1ba69f4181cd2f604fb54f7

3 years agoRemove unused stack/gatt/gatt_int::#defs
Chris Manton [Wed, 3 Mar 2021 01:11:38 +0000 (17:11 -0800)]
Remove unused stack/gatt/gatt_int::#defs

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: Ie2a465efd76aa2b594dbe0bf407176d4819aab1f

3 years agoRe-include bta/ag/bta_ag_sdp.cc
Chris Manton [Mon, 25 Jan 2021 18:04:55 +0000 (10:04 -0800)]
Re-include bta/ag/bta_ag_sdp.cc

Bug: 163134718
Test: cert
Tag: #refactor
Change-Id: I3c7935841504cbc4231f339b8c47a02cfac9ed7f

3 years agocommon Criteria mode: Get all bonded devices key after keystore callback init. am...
weichinweng [Mon, 8 Mar 2021 09:33:21 +0000 (09:33 +0000)]
common Criteria mode: Get all bonded devices key after keystore callback init. am: c98b5a61f5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If42c335e20adcf59db4ddeba38419a621f21fe9a

3 years agoCommon Criteria mode: Rename Common Criteria mode from NIAP mode (2/2) am: f549b6b7b0
weichinweng [Mon, 8 Mar 2021 09:32:33 +0000 (09:32 +0000)]
Common Criteria mode: Rename Common Criteria mode from NIAP mode (2/2) am: f549b6b7b0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88a5a5046e53210bad32d4c259f1e9de59dfe3b7

3 years agoFix handshaking error between HCI driver and rootcanal
JaeMan Park [Mon, 22 Feb 2021 05:42:08 +0000 (14:42 +0900)]
Fix handshaking error between HCI driver and rootcanal

Rootcanal needs to implement response of request
  READ_CLASS_OF_DEVICE
  READ_VOICE_SETTING
  WRITE_CONNECTION_ACCEPT_TIMEOUT

Bug: 180860482
Test: m root-canal
Change-Id: I53e67649c3558ea7d64e6521aa1a602b2245c942

3 years agocommon Criteria mode: Get all bonded devices key after keystore callback init.
weichinweng [Thu, 4 Mar 2021 02:39:56 +0000 (10:39 +0800)]
common Criteria mode: Get all bonded devices key after keystore callback init.

Bug: 181293964
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: I25c70363d7651c27a6c15b60db9402eee359d804

3 years agoCommon Criteria mode: Rename Common Criteria mode from NIAP mode (2/2)
weichinweng [Thu, 4 Mar 2021 01:11:30 +0000 (09:11 +0800)]
Common Criteria mode: Rename Common Criteria mode from NIAP mode (2/2)

Bug: 181293964
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: I8455403fdfad2451831c6b5d3f9162b7e3a0296d

3 years agoRe-include stack/hid/hidd_conn.cc am: e17a9c84ce
Chris Manton [Sat, 6 Mar 2021 03:39:52 +0000 (03:39 +0000)]
Re-include stack/hid/hidd_conn.cc am: e17a9c84ce

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e39431471a3360c4abf5cdabe1471266931fd94

3 years agoRe-include stack/hid/hidd_conn.cc
Chris Manton [Sat, 23 Jan 2021 19:20:08 +0000 (11:20 -0800)]
Re-include stack/hid/hidd_conn.cc

Bug: 163134718
Test: cert
Tag: #refactor
Change-Id: Idd4aa5471bc96a8df01adf2507e8d6bafed37a4c

3 years agoAvoid potential null dereference am: e162661987
Greg Kaiser [Fri, 5 Mar 2021 18:46:07 +0000 (18:46 +0000)]
Avoid potential null dereference am: e162661987

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f720d000ad81820fa56f99f266edd1f957bc32e

3 years agoAvoid potential null dereference
Greg Kaiser [Fri, 5 Mar 2021 16:04:46 +0000 (08:04 -0800)]
Avoid potential null dereference

We move our null check of 'p_dev' to before the first time we
dereference it.

Tag: #stability
Bug: 179741365
Test: TreeHuggger
Change-Id: Iafc45c9f82b88f9f0462f87b029789e861509287

3 years agoMerge "Turn off sanitize options for root-canal for linux_bionic" am: acee176985
Jeongik Cha [Fri, 5 Mar 2021 16:02:43 +0000 (16:02 +0000)]
Merge "Turn off sanitize options for root-canal for linux_bionic" am: acee176985

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64dabf32a05d7dfc183bf2ed91090ee5ad1b6a60

3 years agoMerge "Turn off sanitize options for root-canal for linux_bionic"
Jeongik Cha [Fri, 5 Mar 2021 15:29:21 +0000 (15:29 +0000)]
Merge "Turn off sanitize options for root-canal for linux_bionic"

3 years agoUse cid instead of attribute handle am: 0ea8f91ef5
HsingYuan Lo [Fri, 5 Mar 2021 14:44:34 +0000 (14:44 +0000)]
Use cid instead of attribute handle am: 0ea8f91ef5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98a3e643bc1abc7e3c37b6f2663359e58c1dc0c6

3 years agoUse cid instead of attribute handle
HsingYuan Lo [Tue, 2 Mar 2021 09:52:40 +0000 (17:52 +0800)]
Use cid instead of attribute handle

Current API is defined as below
void BTA_GATTC_SendIndConfirm(uint16_t conn_id, uint16_t cid)

We need to use cid instead of attribute handle, otherwise when eatt is
enabled, something will happen

Bug: 159786353
Test: compile & make sure the cid is correctly sent to stack
Tag: #feature
Change-Id: If0cd9dd6783af7fefdb7af7130e5e9545188eecd

3 years agoCert test scaffolding for iso layer am: 4a9e935ee9
Jakub Pawlowski [Fri, 5 Mar 2021 08:22:59 +0000 (08:22 +0000)]
Cert test scaffolding for iso layer am: 4a9e935ee9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I308089023917e3ee4a348816927e4ca932d2c7b3

3 years agostack/test: Fix memory leak in iso tests am: 15450a8f62
Jakub Tyszkowski [Fri, 5 Mar 2021 08:21:50 +0000 (08:21 +0000)]
stack/test: Fix memory leak in iso tests am: 15450a8f62

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fc37bcae6f7531be5dfa005701b4874f865701f

3 years agoCert test scaffolding for iso layer
Jakub Pawlowski [Tue, 23 Feb 2021 08:19:43 +0000 (09:19 +0100)]
Cert test scaffolding for iso layer

Tag: #feature
Test: cert/run LeIsoTest
Bug: 177907117
Change-Id: Icc23db17d5f6fc8d0fd1f9497a64c99d9f0cfd5e

3 years agostack/test: Fix memory leak in iso tests
Jakub Tyszkowski [Tue, 2 Mar 2021 15:01:59 +0000 (15:01 +0000)]
stack/test: Fix memory leak in iso tests

HCI command buffer should be released after
passing it to the mock bte interface.

Bug:150670922
Tag: #feature
Test: atest net_test_btm_iso
Sponsor: jpawlowski@
Change-Id: I2b1f09614357effeeca09a232f27932e24f00a1b

3 years agoMerge "Bluetooth hal metrics: Add LogBluetoothHalCrashReason" am: 2ad2fc4b2a
Treehugger Robot [Fri, 5 Mar 2021 05:50:35 +0000 (05:50 +0000)]
Merge "Bluetooth hal metrics: Add LogBluetoothHalCrashReason" am: 2ad2fc4b2a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2512d4cf56b2cfa8138e522aa3d99689e826b9ee

3 years agoMerge "Exit notification timeouts immediately for disconnected devices" am: f0f8c689b5
Sal Savage [Fri, 5 Mar 2021 05:47:38 +0000 (05:47 +0000)]
Merge "Exit notification timeouts immediately for disconnected devices" am: f0f8c689b5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3750f19b3dcbde7bc23506db6cf59f22e6f52e6b

3 years agoSome dependencies are host supported am: 70f01015e1
Hansong Zhang [Fri, 5 Mar 2021 05:44:08 +0000 (05:44 +0000)]
Some dependencies are host supported am: 70f01015e1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40db392c31b09262b2f92a3df78add379259a421

3 years agoAdd host support for libbluetooth.so am: 75847f0c0b
Hansong Zhang [Fri, 5 Mar 2021 05:43:22 +0000 (05:43 +0000)]
Add host support for libbluetooth.so am: 75847f0c0b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e822228a3c06062d5af1bcc402ca3e78be95c22

3 years agogd: Fix address manager bug am: 2e0e8680a0
Chienyuan [Fri, 5 Mar 2021 05:35:58 +0000 (05:35 +0000)]
gd: Fix address manager bug am: 2e0e8680a0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I373e704d0eb6347ddb2d649f88501781aad5f4a6

3 years agoMerge "Bluetooth hal metrics: Add LogBluetoothHalCrashReason"
Treehugger Robot [Fri, 5 Mar 2021 04:35:11 +0000 (04:35 +0000)]
Merge "Bluetooth hal metrics: Add LogBluetoothHalCrashReason"

3 years agoMerge "Exit notification timeouts immediately for disconnected devices"
Sal Savage [Fri, 5 Mar 2021 02:03:42 +0000 (02:03 +0000)]
Merge "Exit notification timeouts immediately for disconnected devices"

3 years agoSome dependencies are host supported
Hansong Zhang [Wed, 3 Mar 2021 01:30:10 +0000 (17:30 -0800)]
Some dependencies are host supported

Bug: 181590011
Tag: #refactor
Test: compile
Change-Id: I247a300c3ba35715b5ddb8c06523e71189ba0ab5

3 years agoAdd host support for libbluetooth.so
Hansong Zhang [Tue, 2 Mar 2021 01:52:04 +0000 (17:52 -0800)]
Add host support for libbluetooth.so

Bug: 181590011
Tag: #refactor
Test: compile
Change-Id: I9a53eeaac5a5c612d47671bca4f95cf252faeb93

3 years agogd: Fix address manager bug
Chienyuan [Thu, 4 Mar 2021 13:36:50 +0000 (21:36 +0800)]
gd: Fix address manager bug

Tag: #gd-refactor
Bug: 180869951
Test: gd/cert/run
Change-Id: Ia04aea10c686c8c4ec8985f2ba3f3424691ea825

3 years agoBluetooth hal metrics: Add LogBluetoothHalCrashReason
weichinweng [Tue, 15 Dec 2020 06:56:19 +0000 (14:56 +0800)]
Bluetooth hal metrics: Add LogBluetoothHalCrashReason

Add LogBluetoothHalCrashReason function to collect Bluetooth hal crash
reason.

Bug: 174284338
Tag: #feature
Test: atest BluetoothInstrumentationTests
Change-Id: Ibbc465d3145068fdc7f743b67ae4278b4cdf2430

3 years agoMerge "RootCanal: Disable LeExtendedAdvertising" am: e862a44ff4
Myles Watson [Thu, 4 Mar 2021 02:40:45 +0000 (02:40 +0000)]
Merge "RootCanal: Disable LeExtendedAdvertising" am: e862a44ff4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e05c4114e21d87302e0d2d7277ef358dc01108f

3 years agoMerge "RootCanal: Disable LeExtendedAdvertising"
Myles Watson [Thu, 4 Mar 2021 01:20:12 +0000 (01:20 +0000)]
Merge "RootCanal: Disable LeExtendedAdvertising"