git.osdn.net Git - android-x86/system-bt.git/log

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

commit | commitdiff | tree

Treehugger Robot [Tue, 15 Sep 2020 18:27:26 +0000 (18:27 +0000)]

Merge "GD Reactor: Fix a potential use-after-free"

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 15 Sep 2020 13:11:44 +0000 (13:11 +0000)]

Merge "RootCanal: Add Iso command support for CIG/CIS"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Haibo Huang [Mon, 14 Sep 2020 18:12:02 +0000 (18:12 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 21:13:37 +0000 (21:13 +0000)]

Merge "Remove unused type tBTM_INQ_TYPE"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 20:20:27 +0000 (20:20 +0000)]

Merge "Remove unused API in l2c_api shim"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

[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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "Merge Android R"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge Android R

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Manton [Wed, 9 Sep 2020 17:52:10 +0000 (17:52 +0000)]

Remove unused #defs BTM_ am: b2052f3d8a

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

Change-Id: Ibcb9314b30d1f4e9da777cc99910f422536a1d4a

commit | commitdiff | tree

Chris Manton [Mon, 7 Sep 2020 16:53:56 +0000 (09:53 -0700)]

Move tBTM_INQUIRY_VAR_ST stack/btm::

Structure is not part of security record
From: stack/btm/security_device_record.h
Into: stack/btm/btm_int_types.h

Towards readable code

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

Change-Id: I6a72bcaeb25793a147f6ac131d653c5a96ad02fa

commit | commitdiff | tree

Chris Manton [Mon, 7 Sep 2020 17:06:28 +0000 (10:06 -0700)]

Remove unused #defs BTM_

Towards readable code

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

commit | commitdiff | tree

Martin Brabham [Wed, 9 Sep 2020 00:42:12 +0000 (00:42 +0000)]

Add in metrics calls am: 426886af61

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

Change-Id: Ibff7c285f168fe841504348959275c1aa9a3daac

commit | commitdiff | tree

Martin Brabham [Wed, 9 Sep 2020 00:42:07 +0000 (00:42 +0000)]

Rename LruCache -> LegacyLruCache am: 24460cffcf

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

Change-Id: If16064963c885e3e5b4a53707376b36fe8d708fb

commit | commitdiff | tree

Martin Brabham [Wed, 9 Sep 2020 00:41:19 +0000 (00:41 +0000)]

BTIF DM Shim: Remove obsolete components am: 8db8f6a4ed

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

Change-Id: Ic75bef4c9a7e09fd9622a77ca70cc9ff64c59de5

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 23:11:26 +0000 (23:11 +0000)]

Merge "BTM_API Shim: BTA will call shim BTM_API if GD enabled" am: 1211f6a4d1

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

Change-Id: I919e0692b6fd112b943a1722e72ec0e83e74c05d

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 23:11:17 +0000 (23:11 +0000)]

Merge "Fix l2cap callback connection creation API" am: 45273c4611

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

Change-Id: I954711155b142a67bf3e284bfe20f09c517e32ac

commit | commitdiff | tree

Chris Manton [Tue, 8 Sep 2020 23:11:04 +0000 (23:11 +0000)]

Update stack/::ble_addr_type am: d98fd04182

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

Change-Id: I9ce35a3f044b1645355d061ebf82f1edfed1e303

commit | commitdiff | tree

Chris Manton [Tue, 8 Sep 2020 23:10:25 +0000 (23:10 +0000)]

Update btif/src/::ble_addr_type am: 0aed830450

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

Change-Id: I36b1e471c3310bc96b148d526424032e55bcff00

commit | commitdiff | tree

Martin Brabham [Tue, 8 Sep 2020 20:09:21 +0000 (13:09 -0700)]

Add in metrics calls

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

commit | commitdiff | tree

Martin Brabham [Tue, 8 Sep 2020 20:02:48 +0000 (13:02 -0700)]

Rename LruCache -> LegacyLruCache

There is a naming conflict with common/lru.h
and gd/common/lru_cache.h. In order to make the
metrics calls from the shim on the actual events
the legacy version has been renamed to reflect.

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

commit | commitdiff | tree

Martin Brabham [Thu, 27 Aug 2020 17:23:26 +0000 (10:23 -0700)]

BTIF DM Shim: Remove obsolete components

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

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 22:52:43 +0000 (22:52 +0000)]

Merge "BTM_API Shim: BTA will call shim BTM_API if GD enabled"

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 22:51:05 +0000 (22:51 +0000)]

Merge "Fix l2cap callback connection creation API"

commit | commitdiff | tree

Martin Brabham [Thu, 27 Aug 2020 18:08:34 +0000 (11:08 -0700)]

BTM_API Shim: BTA will call shim BTM_API if GD enabled

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

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 20:25:07 +0000 (20:25 +0000)]

Merge "gatt: Fix CID check when receiving ack" am: 3ab2d8b5ac

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

Change-Id: I7fb11d50873ec9283e3d5afe6cfd752bc0636a12

commit | commitdiff | tree

Chris Manton [Wed, 2 Sep 2020 04:58:08 +0000 (21:58 -0700)]

Update stack/::ble_addr_type

Using strict types tBLE_ADDR_TYPE

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Wed, 2 Sep 2020 04:38:44 +0000 (21:38 -0700)]

Update btif/src/::ble_addr_type

Using strict types tBLE_ADDR_TYPE

Towards readable code

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

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 19:58:36 +0000 (19:58 +0000)]

Merge "gatt: Fix CID check when receiving ack"

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 19:26:46 +0000 (19:26 +0000)]

Merge "Changed HID_DEV_MTU_SIZE from 64 to 512" am: 82156451a3

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

Change-Id: I380f94a952fae5ededc604941ecaf7fc2c95f6bc

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 18:29:48 +0000 (18:29 +0000)]

Merge "Changed HID_DEV_MTU_SIZE from 64 to 512"

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 18:16:44 +0000 (18:16 +0000)]

Merge "Shim: Add GD advertising init flags" am: 98543e7520

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

Change-Id: I7777468151abe527e047b0d54b7f06f6dfeb3fca

commit | commitdiff | tree

Chris Manton [Sun, 6 Sep 2020 04:45:45 +0000 (21:45 -0700)]

Fix l2cap callback connection creation API

Towards readable code

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

Change-Id: I5ba3967775f2544846a8524ac1f76177c7510f45

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 18:01:08 +0000 (18:01 +0000)]

Merge "Shim: Add GD advertising init flags"

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 17:41:31 +0000 (17:41 +0000)]

Merge "bt: don't return the address of a stack-allocated string" am: 81c4a7004c

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

Change-Id: I3961f7a28be5f855715471248eb1887a45dc3759

commit | commitdiff | tree

Treehugger Robot [Tue, 8 Sep 2020 17:14:48 +0000 (17:14 +0000)]

Merge "bt: don't return the address of a stack-allocated string"

commit | commitdiff | tree

Chris Manton [Tue, 8 Sep 2020 16:47:48 +0000 (16:47 +0000)]

Remove l2cap debug logging clutter am: 3c6a4965c1

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

Change-Id: I4bea781397a680e58dfe1fdc647238c6b8cc068d

commit | commitdiff | tree

Chris Manton [Wed, 2 Sep 2020 22:17:51 +0000 (15:17 -0700)]

Remove l2cap debug logging clutter

Towards readable code

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

Change-Id: Ida4ec6ebdc4cac6ce4778fb154fea1c1c0630d06

commit | commitdiff | tree

Jakub Pawlowski [Tue, 8 Sep 2020 03:56:44 +0000 (03:56 +0000)]

Pass AddressWithType into messages correctly am: cc99a86ab3

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

Change-Id: Iaba6ef9e6b6bc15fccfe5232d4d428b1d7a1bb87

commit | commitdiff | tree

HsingYuan Lo [Tue, 8 Sep 2020 03:27:40 +0000 (11:27 +0800)]

gatt: Fix CID check when receiving ack

Tag: #feature
Test: build & test service change behavior
Bug: 159786353
Change-Id: Idb9811e8dd3b0a7bcacc482501f348c477a918c5

commit | commitdiff | tree

Jakub Pawlowski [Mon, 7 Sep 2020 15:06:28 +0000 (17:06 +0200)]

Pass AddressWithType into messages correctly

BluetoothAddress is created from string, which was improperly set to
both address and type up till now. After this is fixed, one can finally
compare address with expected address in events.

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

commit | commitdiff | tree

Danny Trunk [Mon, 7 Sep 2020 14:44:24 +0000 (16:44 +0200)]

Changed HID_DEV_MTU_SIZE from 64 to 512

Changed HID_DEV_MTU_SIZE for Amiibo Backups over Bluetooth support

Signed-off-by: Danny Trunk <dtrunk90@gmail.com>
Change-Id: Ie4226b477d040177108729cb25e711fd35bfe0f2

commit | commitdiff | tree

Chienyuan [Mon, 7 Sep 2020 10:03:56 +0000 (18:03 +0800)]

Shim: Add GD advertising init flags

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