OSDN Git Service

android-x86/system-bt.git
3 years agoRemove unused #defs stack/smp:: am: 8fead02f91
Chris Manton [Thu, 17 Sep 2020 19:39:20 +0000 (19:39 +0000)]
Remove unused #defs stack/smp:: am: 8fead02f91

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

Change-Id: Iba3a35a0f35e6ab79f14b2b43d3ad312ed745cba

3 years agoRemove unused #defs stack/smp::
Chris Manton [Thu, 10 Sep 2020 17:45:23 +0000 (10:45 -0700)]
Remove unused #defs stack/smp::

Towards flattening SMP

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

3 years agoRefactor adding ext prop descriptor am: c0076a0dff
HsingYuan Lo [Thu, 17 Sep 2020 12:24:12 +0000 (12:24 +0000)]
Refactor adding ext prop descriptor am: c0076a0dff

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

Change-Id: Ifba438e317dd59fa2fab4f49d40b927486e88f29

3 years agoRefactor adding ext prop descriptor
HsingYuan Lo [Thu, 17 Sep 2020 08:54:04 +0000 (16:54 +0800)]
Refactor adding ext prop descriptor

In oder to make db hash easier for unit testing
1. Creare a new API to add ext prop descriptor
2. Move the extended properties check to gatt_api.cc

Test: compile
Tag: #refactor
Bug: 110864501
Change-Id: I7afd748e3cd6f6588a30c0f255da4f2ab4b9376c

3 years agoMerge "SDP_SERVER_ENABLED is always true" am: e42ffb89ee
Treehugger Robot [Thu, 17 Sep 2020 00:22:14 +0000 (00:22 +0000)]
Merge "SDP_SERVER_ENABLED is always true" am: e42ffb89ee

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

Change-Id: Ia4bf9a36fe8fcaca22cdd9e2ee73cc7afdd98f07

3 years agoMerge "SDP_SERVER_ENABLED is always true"
Treehugger Robot [Wed, 16 Sep 2020 23:43:59 +0000 (23:43 +0000)]
Merge "SDP_SERVER_ENABLED is always true"

3 years agoMerge "gd: Change AdvertiserId type to uint8_t" am: dfb491f007
Treehugger Robot [Wed, 16 Sep 2020 18:56:54 +0000 (18:56 +0000)]
Merge "gd: Change AdvertiserId type to uint8_t" am: dfb491f007

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

Change-Id: Id936f0b9ce950350e967661627df99f73e2bea45

3 years agoMerge "gd: add shim layer for LE advertising manager" am: da318b067e
Treehugger Robot [Wed, 16 Sep 2020 18:56:44 +0000 (18:56 +0000)]
Merge "gd: add shim layer for LE advertising manager" am: da318b067e

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

Change-Id: Ia70d874085f36b43a9a0a83032c9e34605e772d2

3 years agoMerge "gd: add LE advertising callback" am: 4914ea396b
Treehugger Robot [Wed, 16 Sep 2020 18:55:52 +0000 (18:55 +0000)]
Merge "gd: add LE advertising callback" am: 4914ea396b

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

Change-Id: I5deac074e43b3446c29af33c0a67bcbe0f15ab12

3 years agoMerge "gd: Change AdvertiserId type to uint8_t"
Treehugger Robot [Wed, 16 Sep 2020 18:28:21 +0000 (18:28 +0000)]
Merge "gd: Change AdvertiserId type to uint8_t"

3 years agoMerge "gd: add shim layer for LE advertising manager"
Treehugger Robot [Wed, 16 Sep 2020 18:28:16 +0000 (18:28 +0000)]
Merge "gd: add shim layer for LE advertising manager"

3 years agoMerge "gd: add LE advertising callback"
Treehugger Robot [Wed, 16 Sep 2020 18:27:44 +0000 (18:27 +0000)]
Merge "gd: add LE advertising callback"

3 years agoSDP_SERVER_ENABLED is always true
Hansong Zhang [Wed, 9 Sep 2020 20:07:47 +0000 (13:07 -0700)]
SDP_SERVER_ENABLED is always true

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

3 years agoFix likely-unhit memory leak am: cc0973a644
Chris Manton [Wed, 16 Sep 2020 17:28:09 +0000 (17:28 +0000)]
Fix likely-unhit memory leak am: cc0973a644

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

Change-Id: Iaf8f1b27944ab5cd9b599cc3696d8f0020653c93

3 years agoRemove #def code conditional BT_MAX_SERVICE_NAME_LEN am: 44f3ee6593
Chris Manton [Wed, 16 Sep 2020 17:28:06 +0000 (17:28 +0000)]
Remove #def code conditional BT_MAX_SERVICE_NAME_LEN am: 44f3ee6593

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

Change-Id: I73ce771fb529a1ee8b5d7f5ba33c6f6fe1b3a6f6

3 years agoReplace #def BTM_SEC_SERVICE_NAME_LEN am: a1e1e5245b
Chris Manton [Wed, 16 Sep 2020 17:28:03 +0000 (17:28 +0000)]
Replace #def BTM_SEC_SERVICE_NAME_LEN am: a1e1e5245b

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

Change-Id: I25c1c67028d294773f5f95bae2ba3619f13ac5bd

3 years agoAdd header declarations am: d3285711d8
Chris Manton [Wed, 16 Sep 2020 17:28:00 +0000 (17:28 +0000)]
Add header declarations am: d3285711d8

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

Change-Id: Ifeda47356d6ab8798f03589300e2ac652a380a44

3 years agoRemove unused def L2CAP_WAKE_PARKED_LINK am: 052141550c
Chris Manton [Wed, 16 Sep 2020 17:27:57 +0000 (17:27 +0000)]
Remove unused def L2CAP_WAKE_PARKED_LINK am: 052141550c

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

Change-Id: Ia3f9c3f25bc2b1ce90b836b425d57653e03b47ca

3 years agoRemove unused return val btif/src::btsock_thread_init am: 26c6ab7173
Chris Manton [Wed, 16 Sep 2020 17:27:25 +0000 (17:27 +0000)]
Remove unused return val btif/src::btsock_thread_init am: 26c6ab7173

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

Change-Id: I2b52d0b805a29b7363dccd76dd802a4ae134f5cf

3 years agogd: Change AdvertiserId type to uint8_t
Chienyuan [Wed, 16 Sep 2020 09:10:43 +0000 (17:10 +0800)]
gd: Change AdvertiserId type to uint8_t

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

3 years agogd: add shim layer for LE advertising manager
Chienyuan [Tue, 15 Sep 2020 12:05:42 +0000 (20:05 +0800)]
gd: add shim layer for LE advertising manager

Tag: #refactor
Bug: 159815595
Test: manual
Change-Id: Ib969d1ffe17c97b326d5553da3b054461e1039af

3 years agogd: add LE advertising callback
Chienyuan [Tue, 15 Sep 2020 09:43:14 +0000 (17:43 +0800)]
gd: add LE advertising callback

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

3 years agoFix likely-unhit memory leak
Chris Manton [Sat, 5 Sep 2020 19:24:46 +0000 (12:24 -0700)]
Fix likely-unhit memory leak

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I0cbaf43e04b42468c8588d0dd8b13001ee10229d

3 years agoRemove #def code conditional BT_MAX_SERVICE_NAME_LEN
Chris Manton [Wed, 9 Sep 2020 15:39:48 +0000 (08:39 -0700)]
Remove #def code conditional BT_MAX_SERVICE_NAME_LEN

Ok for constants, poor for code conditionals

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I1e3c7848932ba160411c86243b374d7b5f84403c

3 years agoReplace #def BTM_SEC_SERVICE_NAME_LEN
Chris Manton [Wed, 9 Sep 2020 15:37:22 +0000 (08:37 -0700)]
Replace #def BTM_SEC_SERVICE_NAME_LEN

BTM_SEC_SERVICE_NAME_LEN == BT_MAX_SERVICE_NAME_LEN

Use: BT_MAX_SERVICE_NAME_LEN

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: I60e08e99d10cd2521beb7bbeaffe2263eabdd22d

3 years agoAdd header declarations
Chris Manton [Tue, 8 Sep 2020 05:51:14 +0000 (22:51 -0700)]
Add header declarations

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Ic0897e2cbfe1a61697d3837fceb40138b60783c2

3 years agoRemove unused def L2CAP_WAKE_PARKED_LINK
Chris Manton [Thu, 3 Sep 2020 16:41:47 +0000 (09:41 -0700)]
Remove unused def L2CAP_WAKE_PARKED_LINK

Because when false untested hence unsupported

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Ie24b10ed24230616f9f086b2463b09c37eb57e6f

3 years agoRemove unused return val btif/src::btsock_thread_init
Chris Manton [Fri, 4 Sep 2020 17:47:35 +0000 (10:47 -0700)]
Remove unused return val btif/src::btsock_thread_init

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Iddcc2af04bc397eedb29e9ddaf78abf8215ac045

3 years agoMerge "bnep_disconnect_cfm does nothing" am: e15fdb48ea
Treehugger Robot [Tue, 15 Sep 2020 20:13:19 +0000 (20:13 +0000)]
Merge "bnep_disconnect_cfm does nothing" am: e15fdb48ea

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

Change-Id: I48baa29edffc3cfa72471e6f93718d3635837568

3 years agoMerge "Remove the empty line" am: 1ca46136ea
Treehugger Robot [Tue, 15 Sep 2020 20:12:17 +0000 (20:12 +0000)]
Merge "Remove the empty line" am: 1ca46136ea

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

Change-Id: I4dd771d8b9ed04f49223e0e2e44588f8795031c3

3 years agoMerge "bnep_disconnect_cfm does nothing"
Treehugger Robot [Tue, 15 Sep 2020 19:52:40 +0000 (19:52 +0000)]
Merge "bnep_disconnect_cfm does nothing"

3 years agoMerge "Remove the empty line"
Treehugger Robot [Tue, 15 Sep 2020 19:52:16 +0000 (19:52 +0000)]
Merge "Remove the empty line"

3 years agoMerge "GD Reactor: Fix a potential use-after-free" am: 1c5eae9619
Treehugger Robot [Tue, 15 Sep 2020 18:58:06 +0000 (18:58 +0000)]
Merge "GD Reactor: Fix a potential use-after-free" am: 1c5eae9619

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

Change-Id: I4ded5ae0018bfbfd5d42398c0a44f051b0ed1d41

3 years agoMerge "GD Reactor: Fix a potential use-after-free"
Treehugger Robot [Tue, 15 Sep 2020 18:27:26 +0000 (18:27 +0000)]
Merge "GD Reactor: Fix a potential use-after-free"

3 years agoMerge "RootCanal: Add Iso command support for CIG/CIS" am: 7538c29c91
Treehugger Robot [Tue, 15 Sep 2020 13:33:40 +0000 (13:33 +0000)]
Merge "RootCanal: Add Iso command support for CIG/CIS" am: 7538c29c91

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

Change-Id: I25012d927f7c6f7b77266dab6cae6d4bb39c79d6

3 years agoMerge "RootCanal: Add Iso command support for CIG/CIS"
Treehugger Robot [Tue, 15 Sep 2020 13:11:44 +0000 (13:11 +0000)]
Merge "RootCanal: Add Iso command support for CIG/CIS"

3 years agoGD SMC: Only call Hold for outgoing Link am: 4d723fea0a
Martin Brabham [Tue, 15 Sep 2020 07:38:11 +0000 (07:38 +0000)]
GD SMC: Only call Hold for outgoing Link am: 4d723fea0a

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

Change-Id: Ide065811cf00cb54e73982d83cbf1269e41cc029

3 years agoGD Reactor: Fix a potential use-after-free
Hansong Zhang [Mon, 14 Sep 2020 22:17:07 +0000 (15:17 -0700)]
GD Reactor: Fix a potential use-after-free

When a Reactable is freed, we cannot unlock its internal mutex.

Bug: 168271357
Tag: #gd-refactor
Test: cert/run --host
Change-Id: I4606965f0f3a73411068311fcaced570627e9679

3 years agoRemove the empty line
Hansong Zhang [Mon, 14 Sep 2020 20:12:09 +0000 (13:12 -0700)]
Remove the empty line

To avoid a merge conflict

Test: compile
Change-Id: I7cab2bd47574850e390ffc3673eaeb3d2941ef24

3 years agobnep_disconnect_cfm does nothing
Hansong Zhang [Mon, 14 Sep 2020 20:00:51 +0000 (13:00 -0700)]
bnep_disconnect_cfm does nothing

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

3 years agoGD SMC: Only call Hold for outgoing Link
Martin Brabham [Thu, 10 Sep 2020 20:28:05 +0000 (13:28 -0700)]
GD SMC: Only call Hold for outgoing Link

If we get a call for an incoming Link we do
not want to hold unless we want to do something with it.

Holding incoming connections can result in never Releasing

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I6607c79e7b3af77334fcc871c0bfe31406050978

3 years agoMerge "Using DoAll" am: c3ec3842a5
Haibo Huang [Mon, 14 Sep 2020 18:33:21 +0000 (18:33 +0000)]
Merge "Using DoAll" am: c3ec3842a5

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

Change-Id: Ie584d4e561e9e62a276e6e50325473b50030d324

3 years agoMerge "Using DoAll"
Haibo Huang [Mon, 14 Sep 2020 18:12:02 +0000 (18:12 +0000)]
Merge "Using DoAll"

3 years agoUsing DoAll
Haibo Huang [Thu, 10 Sep 2020 22:13:10 +0000 (15:13 -0700)]
Using DoAll

The new googletest correctly put DoAll in testing namespace.

Exempt-From-Owner-Approval: upgrade
Change-Id: Icff28cf7b160e1016bc88fb8c705575c19ccb734

3 years agoAdd btm_dev and btm_sco hci links am: 6d03059713
Chris Manton [Mon, 14 Sep 2020 16:02:11 +0000 (16:02 +0000)]
Add btm_dev and btm_sco hci links am: 6d03059713

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

Change-Id: I0729c5ed6059aaf09c8da3519af138788119f015

3 years agoadd neighbor_inquiry API am: 999dcb7d7d
Chris Manton [Mon, 14 Sep 2020 16:00:59 +0000 (16:00 +0000)]
add neighbor_inquiry API am: 999dcb7d7d

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

Change-Id: I8092b27ffe7c8f17186e010564e7b0a1933cd9d3

3 years agoAdd various function declarations am: 8947fcf726
Chris Manton [Mon, 14 Sep 2020 06:31:42 +0000 (06:31 +0000)]
Add various function declarations am: 8947fcf726

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

Change-Id: I4e374857e84e071b3ee7c402c34c849770fa2705

3 years agoAdd stack/btm/neighbor_inquiry.h am: 1fd7a642de
Chris Manton [Mon, 14 Sep 2020 06:30:06 +0000 (06:30 +0000)]
Add stack/btm/neighbor_inquiry.h am: 1fd7a642de

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

Change-Id: Id6e8a1a264d08f8aebaee59eef4ecb1f79eae836

3 years agoAdd btm_dev and btm_sco hci links
Chris Manton [Tue, 8 Sep 2020 05:53:25 +0000 (22:53 -0700)]
Add btm_dev and btm_sco hci links

Towards readable code

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

3 years agoadd neighbor_inquiry API
Chris Manton [Tue, 8 Sep 2020 05:54:17 +0000 (22:54 -0700)]
add neighbor_inquiry API

Towards readable code

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

3 years agoAdd various function declarations
Chris Manton [Tue, 8 Sep 2020 05:50:08 +0000 (22:50 -0700)]
Add various function declarations

Towards readable code

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

3 years agoAdd stack/btm/neighbor_inquiry.h
Chris Manton [Mon, 7 Sep 2020 21:04:35 +0000 (14:04 -0700)]
Add stack/btm/neighbor_inquiry.h

Towards readable code

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

3 years agoInclude btm_sec when required am: 5620496020
Chris Manton [Sun, 13 Sep 2020 18:37:20 +0000 (18:37 +0000)]
Include btm_sec when required am: 5620496020

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

Change-Id: I312fb36d1c37684c1319c8fa68f21b50c51a0b4f

3 years agoProfusely Provide Proper Prototypes am: dd0e7ce1d5
Chris Manton [Sun, 13 Sep 2020 18:36:25 +0000 (18:36 +0000)]
Profusely Provide Proper Prototypes am: dd0e7ce1d5

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

Change-Id: I665cab8fedbe7926d4d63fe36fe7344e694edf67

3 years agoInclude btm_sec when required
Chris Manton [Mon, 7 Sep 2020 21:50:07 +0000 (14:50 -0700)]
Include btm_sec when required

Towards readable code

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

3 years agoProfusely Provide Proper Prototypes
Chris Manton [Mon, 7 Sep 2020 21:49:19 +0000 (14:49 -0700)]
Profusely Provide Proper Prototypes

Towards readable code

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

3 years agoMerge changes from topic "gd_security_shim" am: 18224938bb
Martin Brabham [Fri, 11 Sep 2020 23:40:02 +0000 (23:40 +0000)]
Merge changes from topic "gd_security_shim" am: 18224938bb

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

Change-Id: I4af40561c301954a4ccf39e74d31844c83f92732

3 years agoMerge changes from topic "gd_security_shim"
Martin Brabham [Fri, 11 Sep 2020 23:29:06 +0000 (23:29 +0000)]
Merge changes from topic "gd_security_shim"

* changes:
  Add NameDbModule as dependency
  Additional trigger on IO Capability Response
  BTIF DM: Shim out link key management functions

3 years agoMerge changes Ifc9c95d0,I0145e752,I7076dd5c,I55b07770 am: e16d815ca8
Treehugger Robot [Fri, 11 Sep 2020 23:20:09 +0000 (23:20 +0000)]
Merge changes Ifc9c95d0,I0145e752,I7076dd5c,I55b07770 am: e16d815ca8

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

Change-Id: Ia3e9a9e2ab3793223b22a5c5c74aca51755bc4d3

3 years agoMerge changes Ifc9c95d0,I0145e752,I7076dd5c,I55b07770
Treehugger Robot [Fri, 11 Sep 2020 22:50:23 +0000 (22:50 +0000)]
Merge changes Ifc9c95d0,I0145e752,I7076dd5c,I55b07770

* changes:
  Add ISO connection request and response
  RootCanal: Remove acl namespace
  RootCanal: Remove hci namespace
  HCI: Change CIS phy type parameters

3 years agoMerge "Remove unused type tBTM_INQ_TYPE" am: dce48cb038
Treehugger Robot [Fri, 11 Sep 2020 21:47:13 +0000 (21:47 +0000)]
Merge "Remove unused type tBTM_INQ_TYPE" am: dce48cb038

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

Change-Id: I7c531f66fba34034e38088cec1f4ab9915aa0cdb

3 years agoMerge "Remove unused type tBTM_INQ_TYPE"
Treehugger Robot [Fri, 11 Sep 2020 21:13:37 +0000 (21:13 +0000)]
Merge "Remove unused type tBTM_INQ_TYPE"

3 years agoRootCanal: Add Iso command support for CIG/CIS
Myles Watson [Thu, 10 Sep 2020 05:10:31 +0000 (22:10 -0700)]
RootCanal: Add Iso command support for CIG/CIS

Bug: 163818400
Test: cert/run --host
Tag: #feature
Change-Id: I16ead9bbd66b8fe6e32c0e01dd6841c909079738

3 years agoMerge "Remove unused API in l2c_api shim" am: 3bea371096
Treehugger Robot [Fri, 11 Sep 2020 20:39:40 +0000 (20:39 +0000)]
Merge "Remove unused API in l2c_api shim" am: 3bea371096

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

Change-Id: Idd491a8e2ae5bbaddde59cd70842310e7355a750

3 years agoMerge "Remove unused API in l2c_api shim"
Treehugger Robot [Fri, 11 Sep 2020 20:20:27 +0000 (20:20 +0000)]
Merge "Remove unused API in l2c_api shim"

3 years agoAdd NameDbModule as dependency
Martin Brabham [Thu, 3 Sep 2020 21:06:09 +0000 (14:06 -0700)]
Add NameDbModule as dependency

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: I6524577d1395d8fb82f5ec5ed6a53fe7dac97f06

3 years agoAdditional trigger on IO Capability Response
Martin Brabham [Tue, 8 Sep 2020 04:03:29 +0000 (21:03 -0700)]
Additional trigger on IO Capability Response

In some cases IO Capability Response indicates
a pairing session.

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: Ib3a4bddafcb31f344fe4fbbb6441ce9c8e368344

3 years agoMove tINQ_BDADDR from security record am: 2861ace96c
Chris Manton [Fri, 11 Sep 2020 00:59:21 +0000 (00:59 +0000)]
Move tINQ_BDADDR from security record am: 2861ace96c

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

Change-Id: I26a42ad361280243ddf4757283fbcb57a3eb15ce

3 years agoMove tBTM_DEVCB from security device record am: d82ff0bc93
Chris Manton [Fri, 11 Sep 2020 00:59:18 +0000 (00:59 +0000)]
Move tBTM_DEVCB from security device record am: d82ff0bc93

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

Change-Id: I0f41aab4984d4f994c838e2c4a1a6ae5784b07dc

3 years agoRemove unused tBTM_DEVCB::le_supported_states am: 6885061eab
Chris Manton [Fri, 11 Sep 2020 00:58:44 +0000 (00:58 +0000)]
Remove unused tBTM_DEVCB::le_supported_states am: 6885061eab

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

Change-Id: I7834d5cb1fcb62c1ad2114a35990b3239e1507aa

3 years ago[automerger skipped] Merge "Merge Android R" am: 6276e4cbf7 -s ours
Xin Li [Fri, 11 Sep 2020 00:39:32 +0000 (00:39 +0000)]
[automerger skipped] Merge "Merge Android R" am: 6276e4cbf7 -s ours

am skip reason: Change-Id I9d9a661e1106db1b531069a5038f957a009bd3c3 with SHA-1 ae2ab56c5e is in history

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

Change-Id: Iec1e1e0fd71c7c6ccec9dd669bf0e5de10269e10

3 years agoAdd ISO connection request and response
Myles Watson [Wed, 19 Aug 2020 22:55:56 +0000 (15:55 -0700)]
Add ISO connection request and response

Bug: 163818400
Test: cert/run --host
Tag: #feature
Change-Id: Ifc9c95d075117c629949dbdf9a8b50313f12966a

3 years agoRootCanal: Remove acl namespace
Myles Watson [Thu, 10 Sep 2020 00:42:55 +0000 (17:42 -0700)]
RootCanal: Remove acl namespace

Bug: 163818400
Test: cert/run --host
Tag: #feature
Change-Id: I0145e75223f90c6ab161bb08a5339e4a06b9a1e4

3 years agoRootCanal: Remove hci namespace
Myles Watson [Wed, 9 Sep 2020 23:21:17 +0000 (16:21 -0700)]
RootCanal: Remove hci namespace

Bug: 163818400
Test: cert/run --host
Tag: #feature
Change-Id: I7076dd5c3981359c2170ec70b2d280a0363bdddc

3 years agoHCI: Change CIS phy type parameters
Myles Watson [Thu, 10 Sep 2020 00:46:53 +0000 (17:46 -0700)]
HCI: Change CIS phy type parameters

Bug: 163818400
Test: compare with spec
Tag: #feature
Change-Id: I55b07770bd710d5061aedcbad671e9201e53f0e0

3 years agoBTIF DM: Shim out link key management functions
Martin Brabham [Wed, 2 Sep 2020 17:59:24 +0000 (10:59 -0700)]
BTIF DM: Shim out link key management functions

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: If9ee277c0eef2e6ef14d4f6659d01be9651e48cb

3 years agoRemove unused type tBTM_INQ_TYPE
Chris Manton [Mon, 7 Sep 2020 20:42:14 +0000 (13:42 -0700)]
Remove unused type tBTM_INQ_TYPE

Towards readable code

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

3 years agoMove tINQ_BDADDR from security record
Chris Manton [Mon, 7 Sep 2020 20:38:51 +0000 (13:38 -0700)]
Move tINQ_BDADDR from security record

Towards readable code

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

3 years agoMove tBTM_DEVCB from security device record
Chris Manton [Mon, 7 Sep 2020 20:35:17 +0000 (13:35 -0700)]
Move tBTM_DEVCB from security device record

Towards readable code

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

3 years agoRemove unused tBTM_DEVCB::le_supported_states
Chris Manton [Mon, 7 Sep 2020 20:30:45 +0000 (13:30 -0700)]
Remove unused tBTM_DEVCB::le_supported_states

Towards readable code

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

3 years agoMerge "Merge Android R"
Xin Li [Thu, 10 Sep 2020 17:21:54 +0000 (17:21 +0000)]
Merge "Merge Android R"

3 years agoAdd inquiry to hci link interface am: b14e1811aa
Chris Manton [Thu, 10 Sep 2020 07:12:19 +0000 (07:12 +0000)]
Add inquiry to hci link interface am: b14e1811aa

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

Change-Id: Ic51fe31c91a50f282e3f2df21cf4c7169910dc1a

3 years agoProperly include stack/include/acl_api am: 66af1610d8
Chris Manton [Thu, 10 Sep 2020 07:11:21 +0000 (07:11 +0000)]
Properly include stack/include/acl_api am: 66af1610d8

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

Change-Id: I0b96fbac4bf0500880a78a15c4f521519e7a03b1

3 years agoAdd inquiry to hci link interface
Chris Manton [Tue, 8 Sep 2020 04:52:15 +0000 (21:52 -0700)]
Add inquiry to hci link interface

Towards readable code

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

3 years agoProperly include stack/include/acl_api
Chris Manton [Tue, 8 Sep 2020 04:51:26 +0000 (21:51 -0700)]
Properly include stack/include/acl_api

Towards readable code

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

3 years agoMerge Android R
Xin Li [Thu, 10 Sep 2020 03:21:27 +0000 (20:21 -0700)]
Merge Android R

Bug: 168057903
Merged-In: I9d9a661e1106db1b531069a5038f957a009bd3c3
Change-Id: Ib2df8c5a003107b16708ecf51e3f6e7f4df66119

3 years agoStraighten out tBTM_BOND_TYPE am: ce2f04459e
Chris Manton [Thu, 10 Sep 2020 00:38:18 +0000 (00:38 +0000)]
Straighten out tBTM_BOND_TYPE am: ce2f04459e

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

Change-Id: I788b2a6570968c524a5970eda426922a43193d98

3 years agoMove acl only #defs BTM_ACL am: ec7bf9fa7b
Chris Manton [Thu, 10 Sep 2020 00:37:34 +0000 (00:37 +0000)]
Move acl only #defs BTM_ACL am: ec7bf9fa7b

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

Change-Id: I48e3ccfc01fe179324fd88bfcbf8723d10caa15f

3 years agoStraighten out tBTM_BOND_TYPE
Chris Manton [Mon, 7 Sep 2020 19:43:08 +0000 (12:43 -0700)]
Straighten out tBTM_BOND_TYPE

Towards readable code

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

3 years agoMove acl only #defs BTM_ACL
Chris Manton [Mon, 7 Sep 2020 19:39:01 +0000 (12:39 -0700)]
Move acl only #defs BTM_ACL

Towards readable code

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

3 years agoRemove unused def BTM_MAX_SCN am: 2313c9ab4c
Chris Manton [Wed, 9 Sep 2020 22:33:13 +0000 (22:33 +0000)]
Remove unused def BTM_MAX_SCN am: 2313c9ab4c

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

Change-Id: I9d9a661e1106db1b531069a5038f957a009bd3c3

3 years agoRemove unnecessary #def BTM_MAX_SCN am: 20d12d7e33
Chris Manton [Wed, 9 Sep 2020 22:32:33 +0000 (22:32 +0000)]
Remove unnecessary #def BTM_MAX_SCN am: 20d12d7e33

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

Change-Id: If9c39b93adeb36354e2f82afcd8255574e23a623

3 years agoBreak out stack/btm/btm_sco.h am: 2223760845
Chris Manton [Wed, 9 Sep 2020 20:34:07 +0000 (20:34 +0000)]
Break out stack/btm/btm_sco.h am: 2223760845

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

Change-Id: Iaa4ac61a7fd95f2b80f48bdb6ba21589a0362d5e

3 years agoRe-include stack/btm/btm_sco am: ab55e6b9ef
Chris Manton [Wed, 9 Sep 2020 20:33:16 +0000 (20:33 +0000)]
Re-include stack/btm/btm_sco am: ab55e6b9ef

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

Change-Id: I60183322efec94eb5fc2499fc135bcc7ae007396

3 years agoRemove unused def BTM_MAX_SCN
Chris Manton [Mon, 7 Sep 2020 19:32:54 +0000 (12:32 -0700)]
Remove unused def BTM_MAX_SCN

Towards readable code

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

3 years agoRemove unnecessary #def BTM_MAX_SCN
Chris Manton [Mon, 7 Sep 2020 19:31:21 +0000 (12:31 -0700)]
Remove unnecessary #def BTM_MAX_SCN

Towards readable code

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

3 years agoRemove unused API in l2c_api shim
Hansong Zhang [Wed, 9 Sep 2020 19:33:30 +0000 (12:33 -0700)]
Remove unused API in l2c_api shim

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

3 years agoBreak out stack/btm/btm_sco.h
Chris Manton [Mon, 7 Sep 2020 17:14:19 +0000 (10:14 -0700)]
Break out stack/btm/btm_sco.h

Towards usable APIs

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

3 years agoRe-include stack/btm/btm_sco
Chris Manton [Mon, 7 Sep 2020 18:33:18 +0000 (11:33 -0700)]
Re-include stack/btm/btm_sco

Towards readable code

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

3 years agoMove tBTM_INQUIRY_VAR_ST stack/btm:: am: d9907d09f4
Chris Manton [Wed, 9 Sep 2020 17:52:47 +0000 (17:52 +0000)]
Move tBTM_INQUIRY_VAR_ST stack/btm:: am: d9907d09f4

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

Change-Id: I7507c40bf6e7591fd12058c9bef5ea402f195e27